Merge branch '1.2'

Author: gwoo

cake/VERSION.txt

@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.3.8166
+1.2.4.8284

cake/config/config.php

@@ -22,5 +22,5 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-return $config['Cake.version'] = '1.2.3.8166';
+return $config['Cake.version'] = '1.2.4.8284';
 ?>