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

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

e7e55b1a2aa1c0fdd3dad3e72a92370dca8023ea