[geary/wip/713830-disposition: 4/4] Merge branch 'master' into wip/713830-disposition

[Jim Nelson <jnelson src gnome org>]

commit 10a0a39ee6c2cf1b93e5af70f9a1cfe742cc7649
Merge: 3fb2594 2bdd67c
Author: Jim Nelson <jim yorba org>
Date:   Thu Aug 7 16:28:52 2014 -0700

    Merge branch 'master' into wip/713830-disposition

 po/pl.po                                           |   29 ++++----
 .../imap-engine/imap-engine-minimal-folder.vala    |   15 ++--
 .../replay-ops/imap-engine-replay-disconnect.vala  |    5 +-
 src/engine/imap/transport/imap-client-session.vala |   73 +++++++++----------
 ui/composer.glade                                  |   30 ++++++---
 5 files changed, 83 insertions(+), 69 deletions(-)
---