From ac5a0f29bbcd1b2ebedbc2917b677fe9610e56ff Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Tue, 12 Jun 2012 22:09:48 -0700
Subject: Updating version number and release date for 2.1.1

---
 user_guide/changelog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide/changelog.html')

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 1b8b09729..ce3f6b106 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -58,7 +58,7 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Version 2.1.1</h2>
-<p>Release Date: not yet released</p>
+<p>Release Date: June 12, 2012</p>
 
 <ul>
 	<li>General Changes
-- 
cgit v1.2.3-24-g4f1b


From b55050962bb731d1a99430cd37953e55434236a9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Wed, 13 Jun 2012 18:03:30 +0300
Subject: Revert from() alias escaping fix - it was breaking more stuff

---
 user_guide/changelog.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'user_guide/changelog.html')

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index ce3f6b106..ccec890e0 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -91,7 +91,6 @@ Change Log
 	<li>Fixed a bug (#726) - PDO put a 'dbname' argument in it's connection string regardless of the database platform in use, which made it impossible to use SQLite.</li>
 	<li>Fixed a bug - CI_DB_pdo_result::num_rows() was not returning properly value with SELECT queries, cause it was relying on PDOStatement::rowCount().</li>
 	<li>Fixed a bug (#1059) - CI_Image_lib::clear() was not correctly clearing all necessary object properties, namely width and height.</li>
-	<li>Fixed a bug (#1387) - Active Record's <samp>from()</samp> method didn't escape table aliases.</li>
 </ul>
 
 
-- 
cgit v1.2.3-24-g4f1b