cakephp/cakephp — pull request #626 by dereuromark (2012-04-26 23:51:41+00:00)
Title: 2.2 folder merge

folder fix for merging by default to ensure the class works correctly in all cases, especially with multilevel folders. manual change to other merge schemes added. fix for default dirs in test added.