From: Mario <mario@smbclan.net>
Date: Mon, 15 Feb 2016 01:15:52 +0000 (+1000)
Subject: Merge branch 'master' into morphed/hagar
X-Git-Tag: xonotic-v0.8.2~1183^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9219b9a8013b697e9a45fdb2b1ff296b03dfb808;p=xonotic%2Fxonotic-data.pk3dir.git

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

9219b9a8013b697e9a45fdb2b1ff296b03dfb808