From: Samual <samual@xonotic.org>
Date: Fri, 27 Jan 2012 00:22:12 +0000 (-0500)
Subject: Merge remote branch 'origin/terencehill/hud_config_fixes'
X-Git-Tag: xonotic-v0.6.0~78^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ebfe1ba1f44a43346a084748ed635d37ac0a2733;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/hud_config_fixes'
---

ebfe1ba1f44a43346a084748ed635d37ac0a2733