From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 15 Dec 2014 06:41:09 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/issue-1170
X-Git-Tag: xonotic-v0.8.0~73^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=017f2442a6a10d1e4302c425cc8da5b01b667999;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/issue-1170
---

017f2442a6a10d1e4302c425cc8da5b01b667999