From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 10 May 2010 11:15:27 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~199
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=61efc693bb60ef3fd9d34f48b377e9b2a9425b85

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

61efc693bb60ef3fd9d34f48b377e9b2a9425b85