From 74d7841c2643434fbd3e8759f160bda05f82ab0d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 21 Aug 2012 05:23:17 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

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

diff --git a/CHANGELOG b/CHANGELOG
index 6a7b214..784bbc8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 ===========================
 
 - Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed
+- Added session_path config option and unified cookies settings in javascript
+- Added "Undeleted" option to messages list filter
 - Rewritten test scripts for PHPUnit
 - Add new DB abstraction layer based on PHP PDO, supporting SQLite3 (#1488332)
 - Removed PEAR::MDB2 package

--
Gitblit v1.9.1