From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 23 Jul 2010 23:04:27 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~362^2~7
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=baa0f9610afb1e315c8dc067f50cf1521339aedd

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

baa0f9610afb1e315c8dc067f50cf1521339aedd