Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 25 Dec 2011 16:21:20 +0000 (11:21 -0500)
committerSamual <samual@xonotic.org>
Sun, 25 Dec 2011 16:21:20 +0000 (11:21 -0500)
1  2 
qcsrc/server/g_world.qc

Simple merge