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

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

e47fe4a1e465ca76d53c6756973896fd57bc4f82