From: Rudolf Polzer Date: Mon, 16 Jan 2012 09:47:32 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~157^2~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25d4fae5eb2e4b1f85ef90f7d99b9d2200d1c0bc;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 25d4fae5eb2e4b1f85ef90f7d99b9d2200d1c0bc