From a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Mon, 07 Oct 2013 13:19:03 -0400
Subject: [PATCH] Merge pull request #133 from cwickert/release-0.9-canned-responses

---
 CHANGELOG |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index cafdcc5..74ddb72 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,16 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fixed mispelling: occured -> occurred (#1489366)
+- Fixed issues where HTML comments inside style tag would hang Internet Explorer
+- Fix setting domain in virtualmin password driver (#1489332)
+- Hide Delivery Status Notification option when smtp_server is unset (#1489336)
+- Display full attachment name using title attribute when name is too long to display (#1489320)
+- Fix attachment icon issue when rare font/language is used (#1489326)
+- Fix expanded thread root message styling after refreshing messages list (#1489327)
+- Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)
 - Fix error_reporting directive check (#1489323)
+- Fix de_DE localization of "About" label in Help plugin (#1489325)
 
 RELEASE 0.9.4
 -------------
@@ -252,4 +261,3 @@
     Unified global functions naming (rcube_ prefix)
     Better classes separation
     Framework files moved to lib/Roundcube
-

--
Gitblit v1.9.1