From: terencehill <piuntn@gmail.com>
Date: Mon, 6 Jan 2014 00:53:05 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/hud_code_cleanup
X-Git-Tag: xonotic-v0.8.0~226^2~1^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d1feb3163448355ace019ab1c278e47ab2ea77f;p=xonotic%2Fxonotic-data.pk3dir.git

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

1d1feb3163448355ace019ab1c278e47ab2ea77f