From 1ad04a65584d8cf509042bca7d0ff65285dcdc54 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 5 Apr 2007 20:19:33 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [4792]
Merging changes from 1.2.x.x Set class to 1.1.x.x branch

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4794 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 686dbde10..425b53aed 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.4791alpha
\ No newline at end of file
+1.2.0.4794alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index b70b2f0e8..41cb2e356 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -24,5 +24,5 @@
  * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-$config['Cake.version'] = '1.2.0.4791alpha';
+$config['Cake.version'] = '1.2.0.4794alpha';
 ?>
\ No newline at end of file