Merge remote branch 'origin/master' into terencehill/hud_config_fixes
authorSamual <samual@xonotic.org>
Thu, 26 Jan 2012 23:19:33 +0000 (18:19 -0500)
committerSamual <samual@xonotic.org>
Thu, 26 Jan 2012 23:19:33 +0000 (18:19 -0500)

Trivial merge