Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 20 Dec 2011 16:58:16 +0000 (11:58 -0500)
committerSamual <samual@xonotic.org>
Tue, 20 Dec 2011 16:58:16 +0000 (11:58 -0500)

Trivial merge