From: Rudolf Polzer Date: Sat, 27 Aug 2011 09:40:58 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~56 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94a82b02881255012b915709186b14c9caea330e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir --- 94a82b02881255012b915709186b14c9caea330e