[geary: 4/4] Merge branch 'bug/772522-fts-corruption'

[Michael Gratton <mjog src gnome org>]

commit 64004ec424c7fd722b2dba844d0230dc52d27842
Merge: 178817e 3e721fe
Author: Michael Gratton <mike vee net>
Date:   Sat Oct 22 08:10:43 2016 +1100

    Merge branch 'bug/772522-fts-corruption'

 sql/CMakeLists.txt                       |    1 +
 sql/version-025.sql                      |   15 +++++
 src/engine/imap-db/imap-db-database.vala |   46 +++++++++++++++-
 src/engine/imap-db/imap-db-folder.vala   |   92 ++++++++++++++++++-----------
 4 files changed, 118 insertions(+), 36 deletions(-)
---