From: Rudolf Polzer Date: Thu, 16 Dec 2010 09:29:38 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~11 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91db13f951e136707b596bcfe3132d077e78bef3;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 91db13f951e136707b596bcfe3132d077e78bef3