Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 1 Jan 2012 19:44:44 +0000 (14:44 -0500)
committerSamual <samual@xonotic.org>
Sun, 1 Jan 2012 19:44:44 +0000 (14:44 -0500)

Trivial merge