From: Rudolf Polzer Date: Fri, 26 Oct 2012 19:48:31 +0000 (+0200) Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.7.0~34 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2621dbba830ec4ddc6c79d352a2f98666a81f09c;p=xonotic%2Fxonotic.git Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic --- 2621dbba830ec4ddc6c79d352a2f98666a81f09c