From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 29 Jun 2010 08:09:05 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~457^2~63
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e5c79abf7c0dcb65c1fbb10894b1a18a57091c0;p=xonotic%2Fxonotic-data.pk3dir.git

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

3e5c79abf7c0dcb65c1fbb10894b1a18a57091c0