From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Mon, 7 Jun 2010 16:01:58 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~541^2~106^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=83b0c96edec0a188371873bb83b15d024568bca3

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

83b0c96edec0a188371873bb83b15d024568bca3