merging fixes to trunk [7120] [7121] [7122] [7123] [7124]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7125 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-06-05 15:06:49 +00:00
parent f7365640bf
commit e3fea51329
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.0.7119 RC1
1.2.0.7125 RC1

View file

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