From: Rudolf Polzer Date: Thu, 23 Feb 2012 19:18:54 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~53 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6cd9d29be770ad3fd1beb612e8c4423fa74a0d94 Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 6cd9d29be770ad3fd1beb612e8c4423fa74a0d94