mark_story 87fcc9f0b9 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-10-13 21:11:38 -04:00
..
Database	Fix UUID primary key columns not being reflected properly.	2014-09-23 22:16:18 -04:00
Session	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
CakeSessionTest.php	Make CakeSession::read() return null for all failure cases.	2014-10-09 19:27:27 +05:30
DataSourceTest.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
DboSourceTest.php	Merge pull request #4223 from chinpei215/2.6-issue2529-fix	2014-09-03 10:39:37 +02:00