From: Rudolf Polzer Date: Thu, 24 May 2012 10:57:36 +0000 (+0200) Subject: Merge branch 'master' into divVerent/force_colors_teamplay X-Git-Tag: xonotic-v0.7.0~314 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ac0133698b6b0cf951e42821864610b922fc344c;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/force_colors_teamplay --- ac0133698b6b0cf951e42821864610b922fc344c