From: terencehill <piuntn@gmail.com>
Date: Thu, 29 Dec 2016 01:59:28 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/bot_fix
X-Git-Tag: xonotic-v0.8.2~343^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=228743a67588c5488f678a9d0ead45bf8a50b6c2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/bot_fix
---

228743a67588c5488f678a9d0ead45bf8a50b6c2