Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 27 Dec 2011 04:41:34 +0000 (23:41 -0500)
committerSamual <samual@xonotic.org>
Tue, 27 Dec 2011 04:41:34 +0000 (23:41 -0500)

Trivial merge