From: mand1nga <mand1nga@xonotic.org>
Date: Mon, 11 Apr 2011 12:39:26 +0000 (-0300)
Subject: Merge branch 'fruitiex/hud_effect_from_goldenhealth'
X-Git-Tag: xonotic-v0.5.0~307^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00057ff3db596385bc460120e83228db4b222f64;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'fruitiex/hud_effect_from_goldenhealth'
---

00057ff3db596385bc460120e83228db4b222f64