From 581638d50b70feae3079fdaa018daa8da0ebd7e0 Mon Sep 17 00:00:00 2001
From: Anand Chitipothu <anandology@gmail.com>
Date: Mon, 4 Jul 2011 15:40:13 +0530
Subject: [PATCH] web.py 0.36 released.

---
 ChangeLog.txt   | 14 ++++++++++++++
 web/__init__.py |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d2008af8..76452e30 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,19 @@
 # web.py changelog
 
+## 2011-07-04 0.36
+
+* Upgraded to CherryPy WSGIServer 3.2.0. -- #66
+* Various Jython compatibility fixes (tx Ben Noordhuis)
+* allow strips to accept lists -- #69
+* Improvements to setcookie (tx lovelylain) -- #65
+* Added __contains__ method to Session. (tx lovelylain) #65
+* Added secure option to session. -- #38
+* Fixed db.delete error with `using` clause (tx berndtj) -- #28
+* Fixed the case of no where-clauses in db.where
+* Fixed threadlocal error in python2.3 -- #77
+* Fixed TemplateResult inconsistant behavior -- #78
+* Fixed query execution issues with MSSQL -- #71
+
 ## 2011-05-15 0.35
 
 * Better ThreaedDict implementation using threadlocal (tx Ben Hoyt)
diff --git a/web/__init__.py b/web/__init__.py
index 29acfcf8..5fd0295a 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -3,7 +3,7 @@
 
 from __future__ import generators
 
-__version__ = "0.35"
+__version__ = "0.36"
 __author__ = [
     "Aaron Swartz <me@aaronsw.com>",
     "Anand Chitipothu <anandology@gmail.com>"