From 0e458ff30bdd18816ed49185a7e8b8d878797f88 Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Fri, 19 Dec 2008 02:16:01 +0000
Subject: [PATCH] merge fixes to trunk and updating version number

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7945 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/VERSION.txt       | 2 +-
 cake/config/config.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/VERSION.txt b/cake/VERSION.txt
index 74dcb1ba9..2cd19927c 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.7692 RC3
\ No newline at end of file
+1.2.0.7945 RC4
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index 42e019f4c..f86cd11be 100644
--- a/cake/config/config.php
+++ b/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.0.7692 RC3';
+return $config['Cake.version'] = '1.2.0.7945 RC4';
 ?>
\ No newline at end of file