From: Rudolf Polzer Date: Wed, 11 Dec 2013 08:42:25 +0000 (+0100) Subject: Merge branch 'master' into divVerent/ballistic2 X-Git-Tag: xonotic-v0.8.0~190^2~4^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0136b21a9e62bd06b6bfa1c18b6e7580783c8eb0;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/ballistic2 --- 0136b21a9e62bd06b6bfa1c18b6e7580783c8eb0