Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 8 Dec 2011 05:43:34 +0000 (00:43 -0500)
committerSamual <samual@xonotic.org>
Thu, 8 Dec 2011 05:43:34 +0000 (00:43 -0500)

Trivial merge