From: terencehill <piuntn@gmail.com>
Date: Wed, 6 Apr 2016 16:34:00 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/dynamic_hud
X-Git-Tag: xonotic-v0.8.2~882^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f52ddede69621c7c9d31983591902f47fd40d7d0;p=xonotic%2Fxonotic-data.pk3dir.git

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

f52ddede69621c7c9d31983591902f47fd40d7d0