From: Rudolf Polzer Date: Sat, 21 Jul 2012 19:11:50 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay X-Git-Tag: xonotic-v0.7.0~312 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=770fcdb94523646b4869e658ecd3750aa9c693b7;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay --- 770fcdb94523646b4869e658ecd3750aa9c693b7