Merge branch 'master' into honey-backend
commit9359f1154dedb5cdf2e2fcd708649e65ae866b1b
authorOlly Betts <olly@survex.com>
Sat, 30 Dec 2017 21:19:24 +0000 (31 10:19 +1300)
committerOlly Betts <olly@survex.com>
Sat, 30 Dec 2017 21:19:24 +0000 (31 10:19 +1300)
tree2b7e188e590873db0ed7fd360dfd2994662900b7
parentad2cd98de88f1c24a77b84c06e7ff0122152a8c8
parent99d9faf884fd5d58f6657c91d943b5c2dc810182
Merge branch 'master' into honey-backend
xapian-core/backends/documentinternal.h