[geary/wip/unread-status-714865: 3/3] Merge branch 'master' into wip/unread-status-714865

[Charles Lindsay <clindsay src gnome org>]

commit b4daa660af63c300fe58b971d9bc746afbd5729c
Merge: 3cbce89 0f6e76e
Author: Charles Lindsay <chaz yorba org>
Date:   Fri Feb 21 15:09:00 2014 -0800

    Merge branch 'master' into wip/unread-status-714865

 sql/CMakeLists.txt                                |    1 +
 sql/version-019.sql                               |    5 +++
 src/client/composer/composer-window.vala          |    7 +----
 src/engine/imap-db/imap-db-database.vala          |   29 +++++++++++++++++++++
 src/engine/imap-db/imap-db-message-addresses.vala |    3 ++
 5 files changed, 39 insertions(+), 6 deletions(-)
---