cakephp/cakephp — pull request #4047 by ceeram (2014-07-21 12:03:53+00:00)
Title: Fix cs error introduced after resolving merge conflict with master to 2....

...6