From: terencehill <piuntn@gmail.com>
Date: Thu, 12 Jan 2017 13:29:37 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/bot_AI
X-Git-Tag: xonotic-v0.8.2~293^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F404%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

490deb4b29d5bdf744172c07013c0f689a8c39b9