From: Rudolf Polzer Date: Sat, 9 Jul 2011 16:24:43 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into divVerent/cortez-map-fixes X-Git-Tag: xonotic-v0.5.0~98 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bdbf23bc1bc1245e61ae56c2eba30f59368a5679;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/master' into divVerent/cortez-map-fixes --- bdbf23bc1bc1245e61ae56c2eba30f59368a5679