From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 13 Jun 2010 20:35:49 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~46
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a9e41298d7a296528d3ab8aff39826c761f1ae89

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

a9e41298d7a296528d3ab8aff39826c761f1ae89