From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 29 Jun 2010 00:13:40 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~457^2~75
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df0a07022b2f24ad36892fd832b490df8351f4db;p=xonotic%2Fxonotic-data.pk3dir.git

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

df0a07022b2f24ad36892fd832b490df8351f4db