From: Rudolf Polzer Date: Sun, 2 Oct 2011 18:48:34 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a93bf9e5da5f387cad67518bce974afcfebd80b0;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir --- a93bf9e5da5f387cad67518bce974afcfebd80b0