From: terencehill <piuntn@gmail.com>
Date: Sun, 27 Mar 2016 16:20:20 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/race_fix
X-Git-Tag: xonotic-v0.8.2~993^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3bdee6303ce762a39c2ad67a70745668ba298043;p=xonotic%2Fxonotic-data.pk3dir.git

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

3bdee6303ce762a39c2ad67a70745668ba298043