[geary/wip/713150-conversations: 4/20] Merge branch 'master' into wip/713150-conversations

[Jim Nelson <jnelson src gnome org>]

commit e7900cdea62b1ec7977d36397af0ec23eb9547a6
Merge: 5ff7f7a aa97d2c
Author: Jim Nelson <jim yorba org>
Date:   Fri Mar 13 14:03:51 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 src/client/components/main-toolbar.vala            |    8 ++------
 src/client/components/main-window.vala             |    3 ++-
 .../transport/imap-client-session-manager.vala     |    3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)
---