From 1509aae55492fc358282dd4475b66ba0208be7c9 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jul 15 2011 14:27:33 +0000
Subject: fix merge


---

diff --git a/syncevolution.spec b/syncevolution.spec
index 3b5f720..99fac53 100644
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@ -187,6 +187,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 * Fri Jul 15 2011 Peter Robinson <pbrobinson@gmail.com> - 1:1.1.99.5a-1
 - Update to 1.1.99.5a devel release
 
+* Thu Jun 16 2011 Milan Crha <mcrha@redhat.com> 1:1.1.99.4-3
+- Rebuild against newer evolution-data-server
+
+* Fri May 20 2011 Kalev Lember <kalev@smartlink.ee> - 1:1.1.99.4-2
+- Rebuilt for libcamel soname bump
+
 * Thu Apr 28 2011 Peter Robinson <pbrobinson@gmail.com> - 1:1.1.99.4-1
 - Update to 1.1.99.4 devel release