From: Mario <mario@smbclan.net>
Date: Sat, 20 Feb 2016 12:04:06 +0000 (+1000)
Subject: Merge branch 'master' into morphed/hagar
X-Git-Tag: xonotic-v0.8.2~1183^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F284%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into morphed/hagar
---

96c600d5173e97e55f21a1504ab7fa6bb785344d