Squashed commit of the following:
[xonotic/xonotic-maps.pk3dir.git] / maps / entmerge.rb
2010-03-18 xonoticinitial checkin from nexuiz svn r8756