From 6843acc9fced3dc1261e019ad4552b6e4c340ec7 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 30 Jul 2012 06:08:58 -0400
Subject: [PATCH] Merged changes to skin folders

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

diff --git a/CHANGELOG b/CHANGELOG
index 90f5124..52a6c1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Support connections to memcached socket file (#1488577)
+- Enable TinyMCE inlinepopups plugin
+- Update to TinyMCE 3.5.6
 - Correctly escape localized labels in javascript variable (#1488567)
 - Update Net_SMTP/Auth_SASL packages to fix Digest-MD5/Cram-MD5 authentication (#1488571)
 - Don't add attachments content into reply/forward/draft message body (#1488557)

--
Gitblit v1.9.1