From 4e92b974689c0f5e36e3ef1ca0ddf049817010de Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 24 May 2007 04:42:33 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [5163]
 * changing param check in Router::stripEscape()

Revision: [5162]
 * Added in initial functionality for for returning result sets and providing help information

Revision: [5161]
 * Adding API Shell to get method signatures from core CakePHP classes

Revision: [5160]
 * Merging changes from [5157] into DboSource.
 * Adding better check in Router::stripEscape()

Revision: [5159]
 * Adding beforeRender() callback to components

Revision: [5158]
 * fixing pre color in css

Revision: [5157]
 * cleaning up auth, adding options to sort in paginator, adding preg match for database in dbo source

Revision: [5156]
 * Refactoring ACL class locations

Revision: [5155]
 * Fixing undefined variable in Shell:error()

Revision: [5154]
 * adding Media to inflector tests

Revision: [5153]
 * Correcting doc comment

Revision: [5152]
 * Adding Firebird support

Revision: [5151]
 * Fixing visibility based on attribute name convention

Revision: [5150]
 * Adding fix to SecurityComponent::_ _validatePost()

Revision: [5149]
 * Adding fix to allow empty multiple select when using the Security component. Prior to this fix a form would be considered invalid if nothing was selected.

Revision: [5148]
 * Adding access visibility to comment

Revision: [5147]
 * Adding comments to code

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5165 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 467eefffc..3aff14a3e 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.5146alpha
\ No newline at end of file
+1.2.0.5165alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index 93f255561..d594bd9c6 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.5146alpha';
+$config['Cake.version'] = '1.2.0.5165alpha';
 ?>
\ No newline at end of file