From: Mario <mario@smbclan.net>
Date: Sat, 25 Jun 2016 20:29:53 +0000 (+1000)
Subject: Merge branch 'master' into Mario/tweaks
X-Git-Tag: xonotic-v0.8.2~700^2~102^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ff1afbe6825c541b231fb4c4cfcbf60cbb5ecd7;p=xonotic%2Fxonotic-data.pk3dir.git

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

0ff1afbe6825c541b231fb4c4cfcbf60cbb5ecd7