From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 plugins/password/package.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/plugins/password/package.xml b/plugins/password/package.xml
index e639a04..9a056de 100644
--- a/plugins/password/package.xml
+++ b/plugins/password/package.xml
@@ -27,6 +27,7 @@
 	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
 	<notes>
 - Fix wrong (non-specific) error message on crypt or connection error (#1488808)
+- Added option to define IMAP hosts that support password changes - password_hosts
     </notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">

--
Gitblit v1.9.1