From: Rudolf Polzer Date: Wed, 1 Jan 2014 09:49:30 +0000 (+0100) Subject: Merge branch 'master' into divVerent/ballistic2 X-Git-Tag: xonotic-v0.8.0~190^2~4^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=267b14d636d605b1e52aa5482dff6f6827b5db94;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/ballistic2 --- 267b14d636d605b1e52aa5482dff6f6827b5db94