Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:21:47 +0000 (15:21 -0500)
committerSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:21:47 +0000 (15:21 -0500)
1  2 
defaultXonotic.cfg

Simple merge