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

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

cb08bff2ec26a2d975fb0e8e1675be38bfa456ff