From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 24 Aug 2015 03:33:46 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/guide
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9412021cd600358d2e83834f6d00dd9deaa16df7;p=xonotic%2Fxonotic-data.pk3dir.git

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

9412021cd600358d2e83834f6d00dd9deaa16df7