From: Rudolf Polzer Date: Wed, 4 Jan 2012 12:44:30 +0000 (+0100) Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~188^2~30 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa6943d5edcf98b434db249de720c76b1a92ff8d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir --- aa6943d5edcf98b434db249de720c76b1a92ff8d