[geary/wip/713150-conversations: 2/2] Merge branch 'master' into wip/713150-conversations

[Jim Nelson <jnelson src gnome org>]

commit 49f34981b67271164c9fd22f3df96d350eb13d55
Merge: 7f86ab6 3694140
Author: Jim Nelson <jim yorba org>
Date:   Mon Mar 2 17:36:34 2015 -0800

    Merge branch 'master' into wip/713150-conversations

 src/CMakeLists.txt                                 |    9 +-
 src/engine/api/geary-search-folder.vala            |  463 ++------------------
 src/engine/imap-db/imap-db-account.vala            |    2 +-
 .../imap-db-search-email-identifier.vala           |   16 +-
 .../search/imap-db-search-folder-properties.vala   |   16 +
 .../imap-db/search/imap-db-search-folder-root.vala |   14 +
 .../imap-db/search/imap-db-search-folder.vala      |  404 +++++++++++++++++
 .../imap-db/{ => search}/imap-db-search-query.vala |    0
 .../imap-db/{ => search}/imap-db-search-term.vala  |    0
 .../gmail/imap-engine-gmail-search-folder.vala     |    4 +-
 .../imap-engine/imap-engine-generic-account.vala   |    4 +-
 11 files changed, 488 insertions(+), 444 deletions(-)
---