From 0829b76598425f0319014fe5a3bbc08333a59961 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 26 Nov 2011 09:31:50 -0500
Subject: [PATCH] - Fix merging some configuration options in update.sh script (#1485864)

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

diff --git a/CHANGELOG b/CHANGELOG
index 6d30f09..ab4ab1b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix merging some configuration options in update.sh script (#1485864)
 - Fix so TEXT key will remove all HEADER keys in IMAP SEARCH (#1488208)
 - Fix handling contact photo url with https:// prefix (#1488202)
 - Prevent from memory_limit exceeding when trying to parse big messages bodies (#1487424)

--
Gitblit v1.9.1