From: Samual Lenks <samual@xonotic.org>
Date: Mon, 10 Sep 2012 23:10:25 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/mutator_ctf'
X-Git-Tag: xonotic-v0.7.0~240
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=061da0b6c05bc4404ba3ca5889091e82e705aa48

Merge remote-tracking branch 'origin/samual/mutator_ctf'
---

061da0b6c05bc4404ba3ca5889091e82e705aa48