From 1f937b93063903cffc35a02bb41f38bb8468d309 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jan 21 2012 13:05:34 +0000
Subject: fix merge


---

diff --git a/xapian-core.spec b/xapian-core.spec
index 011c4fe..17e1976 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -106,6 +106,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 * Sat Jan 21 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.8-1
 - Update to 1.2.8
 
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Thu Aug 18 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.7-1
 - Update to 1.2.7