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 |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/additional_message_headers/package.xml b/plugins/additional_message_headers/package.xml
index 73c24fb..c15d9f8 100644
--- a/plugins/additional_message_headers/package.xml
+++ b/plugins/additional_message_headers/package.xml
@@ -13,11 +13,10 @@
   <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>

--
Gitblit v1.9.1