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

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

e6003fb86e11cc3d537395e7205bd9c4cf4d5567