From: terencehill <piuntn@gmail.com>
Date: Sun, 19 Apr 2015 10:35:13 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/hud_configure
X-Git-Tag: xonotic-v0.8.1~58^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d7561df40d3fd89c2ddc36317e8fb6b5e90b493d

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

d7561df40d3fd89c2ddc36317e8fb6b5e90b493d