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

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

ff64f05501fbcb470513b2aee64b4aa271d3c6d4