From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Mon, 17 May 2010 17:17:45 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~148
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2ef908ed0fef3660c024e7943863a98dc94fe398

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

2ef908ed0fef3660c024e7943863a98dc94fe398