mark_story a7a6fcae8a Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt		2013-09-17 10:11:24 -04:00
..
Engine	Merge branch 'master' into 2.5	2013-09-17 10:11:24 -04:00
Cache.php	remove code, class names and paths from translation strings.	2013-08-21 00:05:53 +02:00
CacheEngine.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00