From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 5 Jun 2010 15:07:51 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~111
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1a6464ea70a32dc63e3970d6c5f34a1b2fc7c2c;p=xonotic%2Fxonotic-data.pk3dir.git

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

b1a6464ea70a32dc63e3970d6c5f34a1b2fc7c2c