[geary/wip/remote-retry: 4/4] Merge branch 'wip/cx-reestablish' into wip/remote-retry

[Jim Nelson <jnelson src gnome org>]

commit 9689866c276e29cfd151876f70cded8a1cee4fe2
Merge: 0ef874f 528dec9
Author: Jim Nelson <jim yorba org>
Date:   Thu Jan 22 16:52:17 2015 -0800

    Merge branch 'wip/cx-reestablish' into wip/remote-retry

 src/client/application/geary-controller.vala       |    3 +-
 src/engine/imap-db/imap-db-folder.vala             |   35 +++++++
 .../imap-engine/imap-engine-generic-account.vala   |    4 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |    8 +-
 src/engine/imap/api/imap-account.vala              |   17 +++-
 src/engine/imap/imap-error.vala                    |    4 +
 .../transport/imap-client-session-manager.vala     |  105 +++++++++++++++++---
 7 files changed, 155 insertions(+), 21 deletions(-)
---