From 7ac9f780482117fc9d2248b2a4a811e6c1da78e4 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sat, 20 Oct 2007 12:01:30 +0000
Subject: [PATCH] Merging changes and enhancements into the trunk:

Revision: [5812] Revision: [5813] Revision: [5814] Revision: [5815] Revision: [5816]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5818 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 4c8561d7e..5d966083f 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.5811 pre-beta
\ No newline at end of file
+1.2.0.5818 pre-beta
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index c002a3ef6..a9aa0755e 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.5811 pre-beta';
+$config['Cake.version'] = '1.2.0.5818 pre-beta';
 ?>
\ No newline at end of file