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

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

c83334e374466fbd102006591354f42c09aa309f