Merge remote-tracking branch 'origin/samual/mutator_ctf'
authorSamual Lenks <samual@xonotic.org>
Mon, 10 Sep 2012 23:10:25 +0000 (19:10 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 10 Sep 2012 23:10:25 +0000 (19:10 -0400)

Trivial merge