From: Rudolf Polzer Date: Wed, 7 Sep 2011 19:01:09 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~156 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a49bef4b396e0fbedaf2a91460896a58dbe5702;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 6a49bef4b396e0fbedaf2a91460896a58dbe5702