From: FruitieX <fruitiex@gmail.com>
Date: Sat, 14 May 2011 13:04:17 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
X-Git-Tag: xonotic-v0.5.0~263
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=ba32536fe000fd90a7babd4d7ba442578a56a4d5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
---

ba32536fe000fd90a7babd4d7ba442578a56a4d5