From: Rudolf Polzer Date: Sat, 27 Aug 2011 10:06:42 +0000 (+0200) Subject: Merge remote branch 'origin/mirceakitsune/red_planet_tempcollisions' X-Git-Tag: xonotic-v0.5.0~42 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ed50285f8715e23c44e85794cca2881c15c5cd8;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote branch 'origin/mirceakitsune/red_planet_tempcollisions' --- 2ed50285f8715e23c44e85794cca2881c15c5cd8