From 0a9d414084b5c0bef3b319afeddf7e634333a9b1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 21 Dec 2012 14:31:35 +0100
Subject: Update changelog, set version to 6.1

---
 plugins/managesieve/Changelog       | 3 +++
 plugins/managesieve/managesieve.php | 2 +-
 plugins/managesieve/package.xml     | 4 ++--
 program/js/app.js                   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index aa89e69a3..50e51a6c2 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,7 +1,10 @@
+* version 6.1 [2012-12-21]
+-----------------------------------------------------------
 - Fixed filter activation/deactivation confirmation message (#1488765)
 - Moved rcube_* classes to <plugin>/lib/Roundcube for compat. with Roundcube Framework autoloader
 - Fixed filter selection after filter deletion (#1488832)
 - Fixed compatibility with jQueryUI-1.9
+- Don't force 'stop' action on last rule in a script
 
 * version 6.0 [2012-10-03]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 1d8248ed2..1579d6243 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -62,7 +62,7 @@ class managesieve extends rcube_plugin
         "x-beenthere",
     );
 
-    const VERSION  = '6.0';
+    const VERSION  = '6.1';
     const PROGNAME = 'Roundcube (Managesieve)';
     const PORT     = 4190;
 
diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml
index e8e8102b0..d4a7af6b8 100644
--- a/plugins/managesieve/package.xml
+++ b/plugins/managesieve/package.xml
@@ -17,9 +17,9 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-10-03</date>
+	<date>2012-12-21</date>
 	<version>
-		<release>6.0</release>
+		<release>6.1</release>
 		<api>6.0</api>
 	</version>
 	<stability>
diff --git a/program/js/app.js b/program/js/app.js
index 6295aee06..4935dce24 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -990,7 +990,7 @@ function rcube_webmail()
         if (uid = this.get_single_uid()) {
           url = {_reply_uid: uid, _mbox: this.env.mailbox};
           if (command == 'reply-all')
-            // do reply-list, when list is detected and popup menu wasn't used 
+            // do reply-list, when list is detected and popup menu wasn't used
             url._all = (!props && this.commands['reply-list'] ? 'list' : 'all');
           else if (command == 'reply-list')
             url._all = 'list';
-- 
cgit v1.2.3