Merge branch 'master' into honey-backend
commit41ed92f6a2cc02d2636db2098df4fea35d09fa2b
authorOlly Betts <olly@survex.com>
Thu, 11 Jan 2018 00:45:23 +0000 (11 13:45 +1300)
committerOlly Betts <olly@survex.com>
Thu, 11 Jan 2018 00:45:23 +0000 (11 13:45 +1300)
tree6f52e98e4676142543214ebc02014b70030a17e2
parent677903315c0f613917fbcd43c749fc91eb750ecb
parent495c28931d55aadc3917b02e5e8bdc9c8bec2280
Merge branch 'master' into honey-backend
xapian-core/tests/harness/testrunner.cc