From: Rudolf Polzer Date: Thu, 18 Aug 2011 05:00:34 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~122 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31732fe76f43c42412d80a6543ebd6939cd5b68f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 31732fe76f43c42412d80a6543ebd6939cd5b68f