From: terencehill <piuntn@gmail.com>
Date: Sun, 5 Apr 2015 23:12:21 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/hud_configure
X-Git-Tag: xonotic-v0.8.1~58^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bedc4037f669e55758528498bc1eb19311f6f71c;p=xonotic%2Fxonotic-data.pk3dir.git

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

bedc4037f669e55758528498bc1eb19311f6f71c