From: Mario <mario@smbclan.net>
Date: Sun, 14 Feb 2016 23:41:37 +0000 (+1000)
Subject: Merge branch 'master' into morphed/hagar
X-Git-Tag: xonotic-v0.8.2~1183^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=724a41faf2cbfd86d41f3ab59ff8326a831a8326;p=xonotic%2Fxonotic-data.pk3dir.git

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

724a41faf2cbfd86d41f3ab59ff8326a831a8326