From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 17 Dec 2014 00:11:54 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/gametypes/infection
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de54147023ede356f98ccc26a17259f82afeb5b7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/gametypes/infection
---

de54147023ede356f98ccc26a17259f82afeb5b7