Merge remote-tracking branch 'origin/master' into samual/menu_organization
authorSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 17:55:19 +0000 (13:55 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 17:55:19 +0000 (13:55 -0400)

Trivial merge