From e93999c28c51d17a595414e7743145462ca7e29e Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sun, 20 May 2007 06:50:08 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [5132]
 * Adding documentation and internationalizing some messages

Revision: [5131]
 * Removing inline comments in test file

Revision: [5130]
 * Adding link to Xcache in doc comments

Revision: [5128]
 * Adding comments for cache

Revision: [5127]
 * small change in folder chmod

Revision: [5126]
 * Adding fix for failing DboSource tests

Revision: [5125]
 * Adding fix for #2587, _ _backAssociation as real class member

Revision: [5124]
 * Adding fix for #2607, fixes Fatal error: Call to a member function on a non-object when using php 4
 * Adding fix for #2590, fixes ps_files_cleanup_dir: failed: Permission denied

Revision: [5123]
 * Fixing string-based URL generation inside plugins (Ticket #2588)

Revision: [5122]
 * Fixing bad merge

Revision: [5121]
 * Fixing notice in in the skel home.ctp

Revision: [5120]
 * Fixing error notices that are thrown when tmp directory is not writable

Revision: [5119]
 * Adding tests to test usage of set() & save() for editing records

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5135 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 f2eb4cc6f..5a6da96b0 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.5118alpha
\ No newline at end of file
+1.2.0.5135alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index e85e7b84b..815965fba 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.5118alpha';
+$config['Cake.version'] = '1.2.0.5135alpha';
 ?>
\ No newline at end of file