From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 22 Jul 2010 16:55:43 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~400^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bacf7fa8ed11dd72c3bc9f01efced83004237d01;p=xonotic%2Fxonotic-data.pk3dir.git

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

bacf7fa8ed11dd72c3bc9f01efced83004237d01