From: Rudolf Polzer Date: Mon, 17 Oct 2011 04:47:47 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant X-Git-Tag: xonotic-v0.6.0~67 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=f15b9265ecdd46d8e5fc377e62a159b74073f532 Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant --- f15b9265ecdd46d8e5fc377e62a159b74073f532