Merge branch 'master' into honey-backend
commitf8f93d86298e911e750c0e9e0be0a818a5689d8f
authorOlly Betts <olly@survex.com>
Wed, 27 Dec 2017 01:19:12 +0000 (27 14:19 +1300)
committerOlly Betts <olly@survex.com>
Wed, 27 Dec 2017 01:19:12 +0000 (27 14:19 +1300)
tree77eaf9cbe25f10e00fcdab0f918f15e1f9a4ca2f
parent978e94222ef6d98b222ca8f421948968ad776fe6
parent26cef069426b4e5a9a068a5a4069a1662c3da27e
Merge branch 'master' into honey-backend
xapian-core/configure.ac
xapian-core/tests/harness/testrunner.cc