From 43c0a4ee0eb7e03448ae5aec013a76058d56521b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Nov 26 2012 23:19:15 +0000
Subject: fix merge


---

diff --git a/ekiga.spec b/ekiga.spec
index 1362ed5..f6a34c9 100644
--- a/ekiga.spec
+++ b/ekiga.spec
@@ -146,6 +146,12 @@ scrollkeeper-update -q || :
 - Ekiga 4.0.0 stable release - Changelog
   http://ftp.gnome.org/pub/gnome/sources/ekiga/4.0/ekiga-4.0.0.news
 
+* Tue Nov 20 2012 Milan Crha <mcrha@redhat.com> - 3.9.90-3
+- Rebuild against newer evolution-data-server
+
+* Thu Oct 25 2012 Milan Crha <mcrha@redhat.com> - 3.9.90-2
+- Rebuild against newer evolution-data-server
+
 * Sat Aug 25 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 3.9.90-1
 - Ekiga 3.9.90 devel - Changelog
   ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.9/ekiga-3.9.90.news