From: terencehill <piuntn@gmail.com>
Date: Thu, 30 May 2013 21:27:54 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/hud_code_cleanup
X-Git-Tag: xonotic-v0.8.0~226^2~1^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9fc4bc2156cdd6d4f52c1ed6257effabf8c5d41f;p=xonotic%2Fxonotic-data.pk3dir.git

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

9fc4bc2156cdd6d4f52c1ed6257effabf8c5d41f