From: Rudolf Polzer Date: Tue, 5 Jun 2012 17:10:32 +0000 (+0200) Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.7.0~54^2^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f80e7ddb0e83d74348164bd34dc1224f658c1695;p=xonotic%2Fxonotic.git Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic --- f80e7ddb0e83d74348164bd34dc1224f658c1695