From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 21 Jan 2015 06:18:49 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/TimePath/gametypes/infection' into TimePath... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbd2ff54a8b4066ef6696143ed443045de8a70ec;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/TimePath/gametypes/infection' into TimePath/gametypes/infection
---

fbd2ff54a8b4066ef6696143ed443045de8a70ec