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

[Jim Nelson <jnelson src gnome org>]

commit 03223a32a98f320b1f9bfdf80cb51c4031cf5681
Merge: 3231f40 221c196
Author: Jim Nelson <jim yorba org>
Date:   Wed Mar 11 18:44:13 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 src/CMakeLists.txt                                 |    2 +-
 src/client/components/main-toolbar.vala            |    2 +-
 src/client/composer/composer-box.vala              |    4 +-
 src/client/composer/composer-embed.vala            |    2 +-
 src/client/composer/composer-widget.vala           |   15 ++++++++++-
 src/client/composer/composer-window.vala           |    4 +-
 src/client/util/util-gtk.vala                      |    6 ++++
 src/engine/api/geary-account-information.vala      |    2 +-
 src/engine/api/geary-account.vala                  |   13 ++++++----
 src/engine/api/geary-attachment.vala               |    2 +-
 src/engine/api/geary-folder-path.vala              |    2 +-
 src/engine/api/geary-folder-properties.vala        |   26 ++++++++++++-------
 src/engine/api/geary-folder-supports-archive.vala  |    2 +-
 src/engine/api/geary-folder-supports-create.vala   |    2 +
 src/engine/api/geary-folder-supports-move.vala     |    2 +-
 src/engine/api/geary-progress-monitor.vala         |    4 +-
 src/engine/app/app-conversation.vala               |    2 +-
 src/engine/app/app-draft-manager.vala              |   12 ++++----
 src/engine/db/db-connection.vala                   |    2 +-
 src/engine/imap/api/imap-folder-properties.vala    |    3 +-
 src/engine/imap/command/imap-list-command.vala     |    2 +-
 .../imap/command/imap-list-return-parameter.vala   |    2 +-
 src/engine/imap/command/imap-message-set.vala      |    2 +-
 .../message/imap-fetch-body-data-specifier.vala    |   16 +++++++-----
 .../imap/message/imap-fetch-data-specifier.vala    |   12 ++++-----
 src/engine/imap/message/imap-sequence-number.vala  |    8 +++---
 src/engine/imap/message/imap-uid-validity.vala     |    2 +-
 src/engine/imap/message/imap-uid.vala              |    2 +-
 src/engine/imap/parameter/imap-list-parameter.vala |    2 +-
 .../imap/parameter/imap-number-parameter.vala      |    2 +-
 .../imap/parameter/imap-string-parameter.vala      |   14 ++++++----
 src/engine/imap/response/imap-capabilities.vala    |    2 +-
 src/engine/imap/response/imap-fetched-data.vala    |    8 +++---
 .../imap/response/imap-mailbox-information.vala    |    2 +-
 src/engine/mime/mime-content-disposition.vala      |    2 +-
 src/engine/mime/mime-content-parameters.vala       |    8 +++---
 src/engine/mime/mime-content-type.vala             |    4 +-
 src/engine/nonblocking/nonblocking-variants.vala   |    6 ++--
 src/engine/rfc822/rfc822-mailbox-addresses.vala    |    2 +-
 src/engine/rfc822/rfc822-message.vala              |    2 +-
 src/engine/util/util-synchronization.vala          |    8 +----
 41 files changed, 122 insertions(+), 95 deletions(-)
---