From: Rudolf Polzer Date: Wed, 19 Jan 2011 16:21:25 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~318^2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0209288d556022db3c72b07e25da1d20e00f9337;hp=-c Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 0209288d556022db3c72b07e25da1d20e00f9337