From: terencehill <piuntn@gmail.com>
Date: Wed, 18 Jan 2012 17:12:30 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/hud_config_fixes
X-Git-Tag: xonotic-v0.6.0~78^2^2~2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ebd57fa31241642f35b82e541661d0703bb7f93;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/hud_config_fixes
---

2ebd57fa31241642f35b82e541661d0703bb7f93