From: Rudolf Polzer Date: Tue, 31 Jan 2012 20:54:43 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~30 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd036680da98c60fb477f33424843b65e03b36b3;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- fd036680da98c60fb477f33424843b65e03b36b3