From: Rudolf Polzer Date: Fri, 13 Jan 2012 23:32:48 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant X-Git-Tag: xonotic-v0.6.0~29 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=326b154fca62625bc60d13982b93380bf88d9987;p=xonotic%2Fnetradiant.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant --- 326b154fca62625bc60d13982b93380bf88d9987