From: terencehill <piuntn@gmail.com>
Date: Wed, 14 Oct 2015 19:38:55 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/hud_cleanups
X-Git-Tag: xonotic-v0.8.2~1799^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21307f327df5609b82d90496c1c6156d636d1c8d;p=xonotic%2Fxonotic-data.pk3dir.git

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

21307f327df5609b82d90496c1c6156d636d1c8d