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

[Jim Nelson <jnelson src gnome org>]

commit 5ff7f7aebceff552fba75799f5e559c351cf8a3c
Merge: 03223a3 5abd2bb
Author: Jim Nelson <jim yorba org>
Date:   Thu Mar 12 17:39:41 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 po/cs.po                                           |  366 ++++++++++---------
 po/he.po                                           |  371 +++++++++++---------
 po/sk.po                                           |  375 +++++++++++---------
 src/engine/api/geary-engine.vala                   |    2 +-
 src/engine/imap/api/imap-account.vala              |    4 +-
 .../transport/imap-client-session-manager.vala     |   50 ++--
 src/engine/imap/transport/imap-client-session.vala |   63 +++-
 ui/composer.glade                                  |   12 +-
 8 files changed, 694 insertions(+), 549 deletions(-)
---