From: Mario <mario@smbclan.net>
Date: Thu, 23 Jun 2016 20:24:59 +0000 (+1000)
Subject: Merge branch 'master' into Mario/killother
X-Git-Tag: xonotic-v0.8.2~700^2~128^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F327%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

f2a7c3c0c62985e64a71b475c55bc974d28e0805