Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Wed, 11 Jan 2012 20:46:20 +0000 (15:46 -0500)
committerSamual <samual@xonotic.org>
Wed, 11 Jan 2012 20:46:20 +0000 (15:46 -0500)

Trivial merge