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

[Jim Nelson <jnelson src gnome org>]

commit 5a0aebc5a8d8bab80efcb4b1248cf838e8feb61e
Merge: 84aec4c 711ae1c
Author: Jim Nelson <jim yorba org>
Date:   Wed May 14 18:40:32 2014 -0700

    Merge branch 'master' into wip/only-incomplete

 .../yahoo/imap-engine-yahoo-account.vala           |    2 +-
 src/engine/imap/api/imap-account.vala              |   78 ++++++++++++++++++--
 src/engine/imap/api/imap-folder.vala               |    8 +-
 .../imap/message/imap-mailbox-specifier.vala       |   21 +++++-
 .../imap/response/imap-mailbox-information.vala    |   28 ++++---
 src/engine/imap/response/imap-server-data.vala     |    2 +-
 6 files changed, 112 insertions(+), 27 deletions(-)
---