mark_story 734bb9223b Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Core/App.php lib/Cake/VERSION.txt		2014-09-06 23:04:20 -04:00
..
Engine	Merge branch 'master' into 2.6	2014-09-06 23:04:20 -04:00
Cache.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
CacheEngine.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00