Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
[xonotic/xonotic-maps.pk3dir.git] / maps / _init /
2010-03-18 xonoticinitial checkin from nexuiz svn r8756