From: Rudolf Polzer Date: Fri, 30 Aug 2013 08:00:07 +0000 (+0200) Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.8.0~350 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b130c7ceb9f035ba250a879967d8356552bb914;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 1b130c7ceb9f035ba250a879967d8356552bb914