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

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

2547fdbb338d37427cc482fbfad58f524835dbec