[geary/wip/only-incomplete: 4/5] Merge branch 'master' into wip/only-incomplete

[Jim Nelson <jnelson src gnome org>]

commit 62638800780009c4b81c53458748d27abb4861bc
Merge: 988f158 3a157b4
Author: Jim Nelson <jim yorba org>
Date:   Wed May 21 12:44:09 2014 -0700

    Merge branch 'master' into wip/only-incomplete

 po/he.po                                           |  180 +++++++++++---------
 src/client/composer/composer-widget.vala           |   28 ++-
 src/engine/api/geary-progress-monitor.vala         |   46 +++++
 .../imap-engine/imap-engine-minimal-folder.vala    |    5 +-
 4 files changed, 167 insertions(+), 92 deletions(-)
---