From: Mario <zacjardine@y7mail.com>
Date: Sat, 31 Dec 2016 00:44:53 +0000 (+0000)
Subject: Merge branch 'terencehill/bot_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~343
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19eeff94eee19c8ed811eab52fc1a6b539c9d91b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/bot_fix' into 'master'

Bot fixes

See merge request !398
---

19eeff94eee19c8ed811eab52fc1a6b539c9d91b