From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 3 Dec 2010 07:31:23 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/menu-hud_damage'
X-Git-Tag: xonotic-v0.1.0preview~74
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=ee6e2d1de97777a4fdfdb750f412a12dce2178d7

Merge remote branch 'origin/fruitiex/menu-hud_damage'
---

ee6e2d1de97777a4fdfdb750f412a12dce2178d7