From: Mario <mario@smbclan.net>
Date: Sat, 20 Aug 2016 12:43:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/tweaks
X-Git-Tag: xonotic-v0.8.2~695^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=462d8ab7855a5d21dbb28840067e8cb902cf8ebb;p=xonotic%2Fxonotic-data.pk3dir.git

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

462d8ab7855a5d21dbb28840067e8cb902cf8ebb