Merge branch 'terencehill/bot_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 00:44:53 +0000 (00:44 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 00:44:53 +0000 (00:44 +0000)
commit19eeff94eee19c8ed811eab52fc1a6b539c9d91b
tree24bb73f94c1a32e58760a950591b125802e53635
parent514e52ef83521471cf6190c8aac5eda797cd47a0
parente9139b87c1f95f4e01d28bf2350e5af648cc55b3
Merge branch 'terencehill/bot_fix' into 'master'

Bot fixes

See merge request !398