From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 1 Feb 2013 11:57:54 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/rank-change
X-Git-Tag: xonotic-v0.7.0~108^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=582d4772020ad581b8a76d372dd9f5f1ed8a756f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/rank-change
---

582d4772020ad581b8a76d372dd9f5f1ed8a756f