predominant 92215e1795 Merge remote branch 'origin/1.3' into 2.0 ... Conflicts: cake/libs/inflector.php cake/libs/view/helpers/text.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/view/helpers/time.test.php		2010-04-16 23:43:28 +10:00
..
home.ctp	Merge remote branch 'origin/1.3' into 2.0	2010-04-16 23:43:28 +10:00