From 7767bb7e3d948c0f515b0ae351a144e7727ce464 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Mon, 22 Oct 2007 03:39:01 +0000
Subject: [PATCH] Merging changes and enhancements into the trunk:

Revision: [5845] Revision: [5844] Revision: [5843] Revision: [5842] Revision: [5841] Revision: [5840]
Revision: [5839] Revision: [5838] Revision: [5837] Revision: [5836] Revision: [5835] Revision: [5834]
Revision: [5833] Revision: [5832] Revision: [5831] Revision: [5830] Revision: [5829] Revision: [5828]
Revision: [5827] Revision: [5826] Revision: [5825] Revision: [5824] Revision: [5823]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5847 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 c48b32a5f..874e8fa10 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.5821 pre-beta
\ No newline at end of file
+1.2.0.5847 pre-beta
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index e8a098134..fdf3a2b03 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.5821 pre-beta';
+$config['Cake.version'] = '1.2.0.5847 pre-beta';
 ?>
\ No newline at end of file