From: terencehill <piuntn@gmail.com>
Date: Sun, 1 May 2016 07:56:58 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/dynamic_hud
X-Git-Tag: xonotic-v0.8.2~882^2~1
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2a38620bbb43f7b62bbd93e8c22b6abbe627ca86

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

2a38620bbb43f7b62bbd93e8c22b6abbe627ca86