From: FruitieX <fruitiex@gmail.com>
Date: Mon, 11 Apr 2011 12:08:13 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into fruitiex/better_shownames
X-Git-Tag: xonotic-v0.5.0~305^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=608a756561db3c149cd6e198218df0c37c6b736e;p=xonotic%2Fxonotic-data.pk3dir.git

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

608a756561db3c149cd6e198218df0c37c6b736e