cakephp/cakephp — pull request #746 by dereuromark (2012-07-31 21:23:47+00:00)
Title: Merge controller properties correctly

fixes ticket #3079

it basically boils down to Hash::merge and how it works.
It needs an (empty) array to properly merge - null doesnt do it.