[geary/wip/721828-undo-2: 13/13] Merge branch 'master' into wip/721828-undo-2

[Jim Nelson <jnelson src gnome org>]

commit d37e1786b0bb42956c9d40dade13342ab64deaeb
Merge: 90c7837 a624f29
Author: Jim Nelson <jim yorba org>
Date:   Thu Jan 29 14:47:57 2015 -0800

    Merge branch 'master' into wip/721828-undo-2

 help/C/accounts.page                               |   10 ++
 help/C/write.page                                  |    3 +
 help/de/de.po                                      |  120 ++++++++++++++++++--
 po/POTFILES.in                                     |    1 -
 src/CMakeLists.txt                                 |    1 -
 .../accounts/account-dialog-add-edit-pane.vala     |    2 +-
 src/client/accounts/add-edit-page.vala             |   42 ++++++--
 src/client/composer/composer-toolbar.vala          |   10 +-
 src/client/composer/composer-widget.vala           |   61 ++++++++--
 .../conversation-list/conversation-list-view.vala  |   27 ++++-
 src/console/main.vala                              |    9 +-
 src/engine/api/geary-credentials.vala              |    8 +-
 src/engine/app/app-conversation-monitor.vala       |    8 +-
 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/smtp/smtp-abstract-authenticator.vala   |   20 ----
 src/engine/smtp/smtp-authenticator.vala            |   25 ++++-
 src/engine/smtp/smtp-login-authenticator.vala      |   16 ++-
 src/engine/smtp/smtp-plain-authenticator.vala      |   14 ++-
 src/engine/util/util-collection.vala               |    6 +-
 src/engine/util/util-html.vala                     |   15 +++
 src/engine/util/util-string.vala                   |   11 ++
 ui/composer.glade                                  |    4 +-
 ui/login.glade                                     |   24 ++---
 28 files changed, 385 insertions(+), 146 deletions(-)
---