From: Mario <mario@smbclan.net>
Date: Fri, 24 Jun 2016 23:10:50 +0000 (+1000)
Subject: Merge branch 'master' into Mario/gameover_fixes
X-Git-Tag: xonotic-v0.8.2~700^2~101^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1237e104131b37576287fddcbee29a0fe8806f9c;p=xonotic%2Fxonotic-data.pk3dir.git

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

1237e104131b37576287fddcbee29a0fe8806f9c