From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 14 Dec 2014 01:09:46 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/combined_updates
X-Git-Tag: xonotic-v0.8.0~86^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a94cd06c4cc5cb8c51ccb40ef77f93b4b6131207;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/combined_updates
---

a94cd06c4cc5cb8c51ccb40ef77f93b4b6131207