From: mand1nga <mand1nga@xonotic.org>
Date: Thu, 1 Sep 2011 03:05:39 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/samual/shownames_fixes'
X-Git-Tag: xonotic-v0.5.0~14^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a54b6ee38c09904521b2d19c88dad656bf180d24;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/shownames_fixes'
---

a54b6ee38c09904521b2d19c88dad656bf180d24