[geary/wip/713592-drafts: 2/2] Merge branch 'master' into wip/713592-drafts

[Jim Nelson <jnelson src gnome org>]

commit c0ef7c71ed879d04cd5d5e0d9b4497f78d7ced52
Merge: 918d611 0ef2113
Author: Jim Nelson <jim yorba org>
Date:   Fri Jan 9 15:15:41 2015 -0800

    Merge branch 'master' into wip/713592-drafts

 src/CMakeLists.txt                                 |    3 +
 .../gmail/imap-engine-gmail-account.vala           |    7 +-
 .../gmail/imap-engine-gmail-all-mail-folder.vala   |   21 ++++
 .../gmail/imap-engine-gmail-drafts-folder.vala     |   29 +++++
 .../gmail/imap-engine-gmail-folder.vala            |   55 +++++++++-
 .../gmail/imap-engine-gmail-spam-trash-folder.vala |   23 ++++
 .../imap-engine/imap-engine-generic-account.vala   |   25 ++++
 .../imap-engine/imap-engine-minimal-folder.vala    |   19 +++-
 .../replay-ops/imap-engine-copy-email.vala         |   10 ++-
 .../replay-ops/imap-engine-create-email.vala       |    2 +-
 .../replay-ops/imap-engine-move-email.vala         |    2 +-
 .../replay-ops/imap-engine-remove-email.vala       |    3 +-
 src/engine/imap/api/imap-account.vala              |   31 +++++-
 src/engine/imap/api/imap-folder.vala               |   64 +++++++++--
 src/engine/imap/command/imap-message-set.vala      |  124 ++++++++++++++++++++
 src/engine/imap/parameter/imap-list-parameter.vala |   38 ++++++
 .../imap/parameter/imap-number-parameter.vala      |    8 +-
 .../imap/parameter/imap-string-parameter.vala      |   18 +++
 .../imap/response/imap-response-code-type.vala     |    1 +
 src/engine/imap/response/imap-response-code.vala   |   20 +++
 src/engine/imap/transport/imap-deserializer.vala   |    2 +
 src/engine/util/util-collection.vala               |    4 +
 22 files changed, 485 insertions(+), 24 deletions(-)
---