From c1a0b072424568957eb686a049d8419e4d96c476 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 29 Aug 2013 09:20:33 +0200
Subject: Fix setting of Junk and NonJunk flags by markasjunk plugin (#1489285)
 Added possibility to register flag mappings by a plugin.

Conflicts:

	plugins/markasjunk/markasjunk.php
	program/lib/Roundcube/rcube_imap_generic.php
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 1b252264d..b786bc071 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix setting of Junk and NonJunk flags by markasjunk plugin (#1489285)
 - Fix lack of Reply-To address in header of forwarded message body (#1489298)
 - Fix bugs when invoking contact creation form when read-only addressbook is selected (#1489296)
 - Fix identity selection on reply (#1489291)
-- 
cgit v1.2.3