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/additional_message_headers/package.xml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/additional_message_headers/package.xml b/plugins/additional_message_headers/package.xml
index 4d2ac53..c15d9f8 100644
--- a/plugins/additional_message_headers/package.xml
+++ b/plugins/additional_message_headers/package.xml
@@ -5,7 +5,7 @@
     http://pear.php.net/dtd/package-2.0.xsd">
  <name>additional_message_headers</name>
  <channel>pear.roundcube.net</channel>
- <summary>Additional message headers for RoundCube</summary>
+ <summary>Additional message headers for Roundcube</summary>
  <description>Very simple plugin which will add additional headers to or remove them from outgoing messages.</description>
  <lead>
   <name>Ziba Scott</name>
@@ -13,26 +13,24 @@
   <email>email@example.org</email>
   <active>yes</active>
  </lead>
- <date>2010-01-16</date>
- <time>18:19:33</time>
+ <date>2013-08-25</date>
  <version>
-  <release>1.1.0</release>
-  <api>1.1.0</api>
+  <release>1.2.0</release>
+  <api>1.2.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPL v2</license>
- <notes>
-Something about the release!
- </notes>
+ <notes>-</notes>
  <contents>
   <dir baseinstalldir="/" name="/">
    <file name="additional_message_headers.php" role="php">
     <tasks:replace from="@name@" to="name" type="package-info" />
     <tasks:replace from="@package_version@" to="version" type="package-info" />
    </file>
+   <file name="config.inc.php.dist" role="data"></file>
   </dir> <!-- / -->
  </contents>
  <dependencies>

--
Gitblit v1.9.1