[geary/wip/725929-db-opt: 2/2] Merge branch 'search-docid' into wip/725929-db-opt

[Charles Lindsay <clindsay src gnome org>]

commit 97968f22a74f319e01d4e7a277e9249ed8a9f1a0
Merge: b95bc77 4465074
Author: Charles Lindsay <chaz yorba org>
Date:   Mon Mar 10 11:41:51 2014 -0700

    Merge branch 'search-docid' into wip/725929-db-opt

 sql/CMakeLists.txt                       |    1 +
 sql/version-020.sql                      |    7 +++++++
 src/engine/imap-db/imap-db-account.vala  |    6 +++---
 src/engine/imap-db/imap-db-database.vala |    5 ++---
 src/engine/imap-db/imap-db-folder.vala   |   12 ++++++------
 5 files changed, 19 insertions(+), 12 deletions(-)
---