Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Mon, 26 Dec 2011 03:39:04 +0000 (22:39 -0500)
committerSamual <samual@xonotic.org>
Mon, 26 Dec 2011 03:39:04 +0000 (22:39 -0500)

Trivial merge