mark_story 4d6611b328 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-12-17 21:38:32 -05:00
..
I18n.php	Merge branch 'master' into 2.6	2014-12-17 21:38:32 -05:00
L10n.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
Multibyte.php	Simplification of return types. No need to return more mixed than necessary.	2014-11-08 20:07:47 +01:00