From 6bd268c9938d7680bf97e1adc6c3629a67a99439 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Sun, 17 Feb 2008 20:10:32 +0000
Subject: Upstream patch from OpenSUSE.

2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>

	* gui/merging/eab-contact-merging.c: (mergeit): Upstream patch from
	OpenSUSE.



svn path=/trunk/; revision=35030
---
 addressbook/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addressbook/ChangeLog')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index fbbbdb8ea5..4bc276a345 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* gui/merging/eab-contact-merging.c: (mergeit): Upstream patch from
+	OpenSUSE.
+
 2008-02-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/component/addressbook.c (addressbook_authenticate):
-- 
cgit