commit 6b808cc28414677c73491639e99ea17391aadcb4 Merge: e8ce148 bb87a25 Author: Peter Robinson <pbrobinson at gmail.com> Date: Wed Jul 4 15:28:44 2012 +0100 fix merge sources | 2 +- xapian-bindings.spec | 41 ++++++++++------------------------------- 2 files changed, 11 insertions(+), 32 deletions(-) ---