From: Mario <mario@smbclan.net>
Date: Fri, 29 Apr 2016 01:13:24 +0000 (+1000)
Subject: Merge branch 'master' into Mario/use1
X-Git-Tag: xonotic-v0.8.2~945^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F298%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

35528e99ccad9a20fbd6eed640a5bc1bda884acd