From e569b978674ad0791c3a4d362b64dc8ca5173e68 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sat, 31 Mar 2007 17:34:42 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [4716]
Adding fix for Ticket #2316

Revision: [4714]
Adding fix for Ticket #2232.
Added tests for ticket

Revision: [4713]
Adding fix for Ticket #2310

Revision: [4709]
Fixing typos.
Adding fix for $ID: search in I18nExtractor::_ _findVersion(), svn replaced this with the file name.

Revision: [4708]
Updating I18nExtractor. Added methods to extract translation strings from files.

Revision: [4707]
Fixing return value in Session::check()

Revision: [4706]
Removing column length from INT column type in DboMssql (Ticket #2308)

Revision: [4705]
Adding tests and fixtures for self-join associations, and fixing JS syntax for 'indicator' (Ticket #2302)

Revision: [4704]
Fixing NOT operations in query conditions in DboSource (Ticket #2307)

Revision: [4703]
Adding DboSource destructor rollback fix (Ticket #2110)

Revision: [4702]
Adding fix for Ticket #2298.
Added encoding wrapper for email addresses.

Revision: [4701]
Additional URL-parsing fixes for IIS

Revision: [4700]
Fixing limit / offset for SQL Server

Revision: [4699]
Fixing URL parsing/dispatching for IIS installs without rewrite support

Revision: [4698]
Refactoring Controller::paginate() to remove duplicate code.

Revision: [4697]
Adding field quoting fix in DboSource::name() (Ticket #2300)

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4718 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 06fbe4fcc..959b864ac 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.4696alpha
\ No newline at end of file
+1.2.0.4718alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index 2120a7faa..85542a3bd 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.4696alpha';
+$config['Cake.version'] = '1.2.0.4718alpha';
 ?>
\ No newline at end of file