From b7208616cd567a8bbf992dfaca10f7380fdb0f2e Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 21 Oct 2012 10:54:13 -0500
Subject: [PATCH] R-2.2.1

---
 CHANGELOG | 10 ++++++++++
 Makefile  |  2 +-
 VERSION   |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 49a97ad1..16eae8ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+## 2.2.1
+
+- session.connect(cookie_key='secret', compression_level=9) stores sessions in cookies
+- T.is_writable = False prevents T from dynamically updating langauge files
+- all code is more PEP8 compliant
+- better custom_importer behaviour (now works per app, is smalled and faster)
+- fixed some bugs
+- upgraded feedparser.py and rss2.py
+- codemirror has autoresize
+
 ## 2.1.0
 
 - overall faster web2py
diff --git a/Makefile b/Makefile
index 28c222ed..f8208a90 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.1.1 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION
+	echo 'Version 2.2.1 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index 5040eda2..6b905346 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-21 09:23:20) dev
+Version 2.2.1 (2012-10-21 10:54:10) stable