From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 27 Jul 2010 13:46:40 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~400^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2e3dfc593ef37e5c0eacd402dd197e87a958389c

Merge remote branch 'origin/master' into fruitiex/newpanelhud_stable
---

2e3dfc593ef37e5c0eacd402dd197e87a958389c