From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 13 Dec 2014 01:33:53 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/issue-1170
X-Git-Tag: xonotic-v0.8.0~73^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=402c9d84fe00cc341e02db9b6e3db5b617301ed6;p=xonotic%2Fxonotic-data.pk3dir.git

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

402c9d84fe00cc341e02db9b6e3db5b617301ed6