From: Rudolf Polzer Date: Wed, 21 Dec 2011 15:36:07 +0000 (+0100) Subject: Merge branch 'master' of /var/cache/git/xonotic/netradiant X-Git-Tag: xonotic-v0.6.0~36 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=56bbeb0552cc1159720b3831eaa2aa79e9a71cae;p=xonotic%2Fnetradiant.git Merge branch 'master' of /var/cache/git/xonotic/netradiant --- 56bbeb0552cc1159720b3831eaa2aa79e9a71cae