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

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

4c6fd2eb384f950946330a01357ffe52d7219bc3