From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 14:39:17 +0000 (+1100)
Subject: Merge branch 'Mario/race_cts_mutators'
X-Git-Tag: xonotic-v0.8.0~164
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=22cd565b717daf5c4b2c327cfb3d6ad2b851a719;hp=22cd565b717daf5c4b2c327cfb3d6ad2b851a719;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/race_cts_mutators'

Conflicts:
	qcsrc/server/progs.src
---