From: terencehill <piuntn@gmail.com>
Date: Tue, 14 Jun 2016 18:15:35 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/hud_shake_fix
X-Git-Tag: xonotic-v0.8.2~805^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6dd336135aa93ee4617df2389c3bfb28f0e1c58;p=xonotic%2Fxonotic-data.pk3dir.git

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

f6dd336135aa93ee4617df2389c3bfb28f0e1c58