From: Rudolf Polzer Date: Sat, 24 Dec 2011 10:00:20 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~63 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=3e945573e8e6eaeaa26bbfd20d140112fd6278ae;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 3e945573e8e6eaeaa26bbfd20d140112fd6278ae