From: Rudolf Polzer Date: Thu, 20 Jan 2011 09:53:21 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~133^2~1 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=91f9ddbf8b6818734bc6bf3b574300079ec2b709 Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 91f9ddbf8b6818734bc6bf3b574300079ec2b709