From: Samual <samual@xonotic.org>
Date: Thu, 26 Jan 2012 23:19:33 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into terencehill/hud_config_fixes
X-Git-Tag: xonotic-v0.6.0~78^2^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1ecbcab6230a6b7b58eb1c5dfddb887b390c937e;p=xonotic%2Fxonotic-data.pk3dir.git

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

1ecbcab6230a6b7b58eb1c5dfddb887b390c937e