[geary/wip/only-incomplete: 5/6] Merge branch 'master' into wip/only-incomplete

[Jim Nelson <jnelson src gnome org>]

commit efff9fbda9a39ba22051f5fc3f4080be4c78f0dc
Merge: b28ee90 c26525e
Author: Jim Nelson <jim yorba org>
Date:   Tue May 13 18:38:01 2014 -0700

    Merge branch 'master' into wip/only-incomplete

 bindings/vapi/gmime-2.6.vapi                       |    2 +-
 bindings/vapi/gmime-2.6/gmime-2.6.metadata         |    2 +-
 src/engine/api/geary-folder.vala                   |    3 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |   41 ++++++++++++++-----
 src/engine/imap/api/imap-folder.vala               |   23 +++++++++--
 src/engine/imap/message/imap-internal-date.vala    |    4 +-
 src/engine/rfc822/rfc822-message-data.vala         |   21 ++++++++--
 src/engine/rfc822/rfc822-message.vala              |    3 +-
 8 files changed, 71 insertions(+), 28 deletions(-)
---