Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
authorSamual Lenks <samual@xonotic.org>
Fri, 7 Sep 2012 03:51:29 +0000 (23:51 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 7 Sep 2012 03:51:29 +0000 (23:51 -0400)
1  2 
defaultXonotic.cfg

Simple merge