[xapian-core: 2/2] fix merge

[Peter Robinson]

commit 1f937b93063903cffc35a02bb41f38bb8468d309
Merge: d949968 a8fb213
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jan 21 13:05:34 2012 +0000

    fix merge

 xapian-core.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc xapian-core.spec
index 011c4fe,dd1c13c..17e1976
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@@ -103,9 -103,9 +103,12 @@@ rm -rf %{buildroot}%{_datadir}/doc/%{na
  %{_mandir}/man1/xapian-config.1*
  
  %changelog
 +* Sat Jan 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.8-1
 +- Update to 1.2.8
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Aug 18 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.7-1
  - Update to 1.2.7