[xapian-bindings/f17: 6/6] Merge branch 'master' into f17

[Peter Robinson]

commit 4c80d00ad919b26ff36e2ab404d209f5fd73da31
Merge: 6b808cc 58ef5bc
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Mar 24 17:27:35 2013 +0000

    Merge branch 'master' into f17

 fix-ruby.patch       |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 sources              |    2 +-
 xapian-bindings.spec |   20 +++++++++++----
 3 files changed, 81 insertions(+), 6 deletions(-)
---