[geary/wip/713190-resort-2: 7/7] Merge branch 'master' into wip/713190-resort-2

[Jim Nelson <jnelson src gnome org>]

commit 0afaf986a98a27c342a5ea4b481bd4f1c761d889
Merge: 3a2780e a624f29
Author: Jim Nelson <jim yorba org>
Date:   Thu Jan 29 21:59:02 2015 -0800

    Merge branch 'master' into wip/713190-resort-2

 help/C/accounts.page                               |   10 ++++
 help/C/write.page                                  |    3 +
 po/POTFILES.in                                     |    1 -
 .../accounts/account-dialog-add-edit-pane.vala     |    2 +-
 src/client/accounts/add-edit-page.vala             |   42 ++++++++++++++---
 src/client/composer/composer-widget.vala           |   10 ++--
 .../conversation-list/conversation-list-view.vala  |   27 ++++++++++-
 src/console/main.vala                              |    9 +++-
 src/engine/imap-db/imap-db-account.vala            |   11 ++++
 src/engine/imap/api/imap-folder.vala               |   49 ++++++++-----------
 src/engine/imap/command/imap-search-command.vala   |   12 ++++-
 src/engine/imap/command/imap-search-criteria.vala  |    4 +-
 src/engine/imap/response/imap-server-data.vala     |   16 +++----
 src/engine/imap/transport/imap-client-session.vala |    2 +-
 src/engine/util/util-collection.vala               |    6 +-
 src/engine/util/util-html.vala                     |   15 ++++++
 src/engine/util/util-string.vala                   |   11 ++++
 ui/login.glade                                     |   24 ++++------
 18 files changed, 176 insertions(+), 78 deletions(-)
---