From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 CHANGELOG |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 28ea75d..7bb3030 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,32 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Integrate patch with more configuarion possibilities to LDAP (#1488753)
+- New feature "Canned Responses" to save and recall boilerplate text snippets
+
+RELEASE 0.9.5
+-------------
+- Fix failing vCard import when email address field contains spaces (#1489386)
+- Fix default spell-check configuration after Google suspended their spell service
+- Fix vulnerability in handling _session argument of utils/save-prefs (#1489382)
+- Fix iframe onload for upload errors handling (#1489379)
+- Fix address matching in Return-Path header on identity selection (#1489374)
+- Fix text wrapping issue with long unwrappable lines (#1489371)
+- 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
 -------------
+- Make identities matching case insensitive (#1485480)
+- Fix issue where too big message data was stored in cache causing sql errors (#1489316)
 - Fix iframe scrollbars on webkit desktop browsers (#1489306)
 - Fix issue where legacy config was overriden by default config (#1489288)
 - Fix newmail_notifier issue where favicon wasn't changed back to default (#1489313)
@@ -248,4 +272,3 @@
     Unified global functions naming (rcube_ prefix)
     Better classes separation
     Framework files moved to lib/Roundcube
-

--
Gitblit v1.9.1