From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 11 Oct 2015 08:40:25 +0000 (+1100)
Subject: Merge branch 'TimePath/cleanup'
X-Git-Tag: xonotic-v0.8.2~1839
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=3ae1efa7401791e42e3171f4db2cc2d38adde088;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/cleanup'
---

3ae1efa7401791e42e3171f4db2cc2d38adde088