From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 27 Sep 2015 08:54:17 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/guide
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e14fdac759bfbddefbcd3212d45e23dff9fa7586;p=xonotic%2Fxonotic-data.pk3dir.git

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

e14fdac759bfbddefbcd3212d45e23dff9fa7586