From: Mario <mario@smbclan.net>
Date: Fri, 13 Nov 2015 14:29:42 +0000 (+1000)
Subject: Merge branch 'master' into Mario/bulldozer
X-Git-Tag: xonotic-v0.8.2~1654^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c741e6b3f012aa525f23e1df30d1d933b383fbc5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/bulldozer
---

c741e6b3f012aa525f23e1df30d1d933b383fbc5