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

[Jim Nelson <jnelson src gnome org>]

commit fd58f26e9104045ea0f3f0da821d097e3f6acf97
Merge: c0ef7c7 c5da6c6
Author: Jim Nelson <jim yorba org>
Date:   Mon Jan 12 15:54:14 2015 -0800

    Merge branch 'master' into wip/713592-drafts

 po/hu.po                                           |   43 +++---
 src/CMakeLists.txt                                 |    4 +-
 src/engine/abstract/geary-abstract-account.vala    |  138 -----------------
 src/engine/abstract/geary-abstract-folder.vala     |  122 ---------------
 .../geary-abstract-local-folder.vala               |    8 +-
 src/engine/api/geary-account.vala                  |  158 +++++++++++---------
 src/engine/api/geary-engine.vala                   |   11 ++
 src/engine/api/geary-folder.vala                   |  104 +++++++++++---
 .../imap-engine/imap-engine-generic-account.vala   |    2 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |   32 ++++-
 .../imap-engine-abstract-list-email.vala           |    4 +-
 .../replay-ops/imap-engine-fetch-email.vala        |    4 +-
 .../replay-ops/imap-engine-mark-email.vala         |    2 +-
 .../replay-ops/imap-engine-move-email.vala         |    8 +-
 .../replay-ops/imap-engine-remove-email.vala       |    8 +-
 15 files changed, 256 insertions(+), 392 deletions(-)
---