From: terencehill <piuntn@gmail.com>
Date: Tue, 22 Mar 2016 19:10:25 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/race_fix
X-Git-Tag: xonotic-v0.8.2~993^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=77d6a05629e33da863fccb3cdd03b3c63af890dd;p=xonotic%2Fxonotic-data.pk3dir.git

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

77d6a05629e33da863fccb3cdd03b3c63af890dd