From: FruitieX <fruitiex@gmail.com>
Date: Wed, 13 Apr 2011 06:51:59 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into fruitiex/borken_shownames
X-Git-Tag: xonotic-v0.5.0~297
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2671eb26f096af4023a0119bbc87a4801a5e66d;p=xonotic%2Fxonotic-data.pk3dir.git

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

e2671eb26f096af4023a0119bbc87a4801a5e66d