From 847cf2345fa9907baf0534fe1b509c488a193d95 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Fri, 6 Apr 2007 12:38:06 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [4802]
Refactoring duplicate code into one method

Revision: [4801]
Adding fixes for Ticket #2357, Ticket #2358
Added tests from Ticket #2357, Ticket #2358
Fixed failing DboSourceTest:
source:/branches/1.2.x.x/cake/tests/cases/libs/model/datasources/dbo_source.test.php@4778#L1080

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4804 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 f22f15d50..af90a68f7 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.4798alpha
\ No newline at end of file
+1.2.0.4804alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index a3ff77fa9..900f3449e 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.4798alpha';
+$config['Cake.version'] = '1.2.0.4804alpha';
 ?>
\ No newline at end of file