From: FruitieX <fruitiex@gmail.com>
Date: Sat, 16 Apr 2011 11:25:33 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/panelhud
X-Git-Tag: xonotic-v0.5.0~274
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8bac780bb3585a2668469ea787ca92474bb89ed5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into fruitiex/panelhud
---

8bac780bb3585a2668469ea787ca92474bb89ed5