[syncevolution: 3/3] fix merge

[Peter Robinson]

commit 1509aae55492fc358282dd4475b66ba0208be7c9
Merge: 08d33a7 2504311
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Jul 15 15:27:33 2011 +0100

    fix merge

 syncevolution.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc syncevolution.spec
index 3b5f720,dbb2686..99fac53
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@@ -184,9 -186,12 +184,15 @@@ desktop-file-validate %{buildroot}/%{_d
  %{_datadir}/syncevolution/xml/*.pl
  
  %changelog
 +* Fri Jul 15 2011 Peter Robinson <pbrobinson at gmail.com> - 1:1.1.99.5a-1
 +- Update to 1.1.99.5a devel release
 +
+ * Thu Jun 16 2011 Milan Crha <mcrha at redhat.com> 1:1.1.99.4-3
+ - Rebuild against newer evolution-data-server
+ 
+ * Fri May 20 2011 Kalev Lember <kalev at smartlink.ee> - 1:1.1.99.4-2
+ - Rebuilt for libcamel soname bump
+ 
  * Thu Apr 28 2011 Peter Robinson <pbrobinson at gmail.com> - 1:1.1.99.4-1
  - Update to 1.1.99.4 devel release