[syncevolution: 2/2] fix merge

[Peter Robinson]

commit 957b4ed8b7073498abb34e43c601cf9229ae85a8
Merge: dc380e5 b18c1a3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jul 28 10:00:41 2012 +0100

    fix merge

 syncevolution.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc syncevolution.spec
index 09bd4dc,d45928a..606df27
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@@ -160,11 -181,12 +160,17 @@@ desktop-file-validate %{buildroot}/%{_d
  %{_datadir}/syncevolution/xml/*.pl
  
  %changelog
 +* Sat Jul 28 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1:1.2.99.3-1
 +- Update to 1.2.99.3 devel release
 +- Drop MeeGo sub package
 +- Drop gdbus patch as it's now fixed upstream
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Wed May 02 2012 Milan Crha <mcrha at redhat.com> - 1:1.2.2-3
+ - Rebuild against newer evolution-data-server
+ 
  * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 1:1.2.2-2
  - Rebuild against PCRE 8.30