cakephp/cakephp — pull request #502 by dereuromark (2012-02-21 14:14:19+00:00)
Title: 2.1 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 added before starting the test. this ensures that if the tmp folder didnt contain all default dirs, that they are added.