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