From d2b4701a11857fb129aeb3969460b0a02de8dd1d Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Mon, 9 Jul 2007 05:57:03 +0000
Subject: [PATCH] Merging changes into the trunk: Revision: [5424]  * updating
 AclComponent to load custom component which should extend AclBase

Revision: [5423]
 * updating Auth component and tests

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5425 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 0ffd863bd..7f406c67b 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.5422alpha
\ No newline at end of file
+1.2.0.5425alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index d8e24f77b..cf936459c 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.5422alpha';
+$config['Cake.version'] = '1.2.0.5425alpha';
 ?>
\ No newline at end of file