From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 7 Jul 2010 12:29:40 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~457^2~3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=3c4a44670479ada63341b2ad4dd4e9b6bf8648b9

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

3c4a44670479ada63341b2ad4dd4e9b6bf8648b9