Merge branch '2.5' of github.com:cakephp/cakephp into 2.5

This commit is contained in:
mark_story 2014-02-26 21:09:06 -05:00
commit 706ddfccae