From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 11 Jul 2010 00:19:15 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~362^2~44^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=070d139d5e21264d1ac91a6c96631c933f092861;p=xonotic%2Fxonotic-data.pk3dir.git

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

070d139d5e21264d1ac91a6c96631c933f092861