From 911961736e0d3f5c4dcaac6452073bdfcf6c1732 Mon Sep 17 00:00:00 2001
From: Massimo DiPierro <massimodipierro@Massimos-MacBook-Air.local>
Date: Tue, 28 Feb 2012 15:13:07 -0600
Subject: [PATCH] updated changelog

---
 CHANGELOG | 1 +
 VERSION   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 00dc68a1..649ed29d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@
 - auth.is_impersonating()
 - reponse.delimiters = ('\\[','\\]') (thanks Denes)
 - Teradata support (experimental)
+- web2py_component has timeout parameter, thanks Alan
 - 100's of small bug fixes and small improvements
 
 ## 1.99.4
diff --git a/VERSION b/VERSION
index 6a4d6c8d..08a81b93 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-02-28 15:09:09) stable
+Version 1.99.4 (2012-02-28 15:13:05) stable