merging fixes to trunk

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8004 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2009-01-16 20:15:21 +00:00
parent d75b063dca
commit 9f83e96fb9
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.0.7962
1.2.1.8004

View file

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