From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 26 Oct 2011 07:11:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/samual/hud_updates'
X-Git-Tag: xonotic-v0.6.0~35^2~78^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2855161bde224eeb01bcffd654d726c3ba0cf73b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/hud_updates'
---

2855161bde224eeb01bcffd654d726c3ba0cf73b