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)
commit1ecbcab6230a6b7b58eb1c5dfddb887b390c937e
treebb5008bd22b21aede0e1fdf5734f437a5c0e5728
parent2ebd57fa31241642f35b82e541661d0703bb7f93
parent6212ea15c77fc66a98a8eb49393d20b79a89efc2
Merge remote branch 'origin/master' into terencehill/hud_config_fixes