From: terencehill <piuntn@gmail.com>
Date: Wed, 11 Jan 2017 15:05:06 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/bot_AI
X-Git-Tag: xonotic-v0.8.2~293^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a95f583ffc1c2f0a393262a550d1a3254b919a7e;p=xonotic%2Fxonotic-data.pk3dir.git

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

a95f583ffc1c2f0a393262a550d1a3254b919a7e