From: Samual <samual@xonotic.org>
Date: Tue, 30 Aug 2011 08:52:17 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/shownames_fixes
X-Git-Tag: xonotic-v0.5.0~14^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07d12c6277ea8e7655cb5991c34f0d9cb4616c3d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/shownames_fixes
---

07d12c6277ea8e7655cb5991c34f0d9cb4616c3d