From: Rudolf Polzer Date: Wed, 5 Oct 2011 13:55:25 +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~92 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e098e2969192fd941e4b5119b0f596510a106ad;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 1e098e2969192fd941e4b5119b0f596510a106ad