From c0aedfa34a641d5116ae8b8d5c1009c54ffee3b0 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 14 Aug 2012 03:59:54 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 plugins/managesieve/Changelog |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index dc0e195..482cff0 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,5 +1,17 @@
+- Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)
+
+* version 5.2 [2012-07-24]
+-----------------------------------------------------------
+- Added GUI for variables setting - RFC5229 (patch from Paweł Słowik)
+- Fixed scrollbars in Larry's iframes
+- Fix performance issue in message_headers_output hook handling
+
+* version 5.1 [2012-06-21]
+-----------------------------------------------------------
 - Fixed filter popup width (for non-english localizations)
 - Fixed tokenizer infinite loop on invalid script content
+- Larry skin support
+- Fixed custom header name validity check, made RFC2822-compliant
 
 * version 5.0 [2012-01-05]
 -----------------------------------------------------------

--
Gitblit v1.9.1