From: Mario <mario@smbclan.net>
Date: Mon, 26 Oct 2015 06:55:29 +0000 (+1000)
Subject: Merge branch 'master' into Mario/bulldozer
X-Git-Tag: xonotic-v0.8.2~1654^2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c02d8f81f571b3cf7a5ad23bfa3e0ca2f39c8fa;p=xonotic%2Fxonotic-data.pk3dir.git

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

8c02d8f81f571b3cf7a5ad23bfa3e0ca2f39c8fa