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

[Jim Nelson <jnelson src gnome org>]

commit a178ec02168444952fc7381efa39b16bc0d3f351
Merge: 48536ac c8c4ad2
Author: Jim Nelson <jim yorba org>
Date:   Tue Jan 20 16:32:57 2015 -0800

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

 src/client/application/geary-controller.vala |    4 +--
 src/engine/app/app-conversation-monitor.vala |   27 +++++++++++--------------
 2 files changed, 13 insertions(+), 18 deletions(-)
---