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

[Jim Nelson <jnelson src gnome org>]

commit 3231f404e9964c838b8d45e1987a6f379d31d577
Merge: dd3478e ef87b0d
Author: Jim Nelson <jim yorba org>
Date:   Wed Mar 11 15:38:35 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 po/POTFILES.in                                     |    1 +
 po/fi.po                                           |  859 ++++---
 po/kk.po                                           |  837 ++++---
 po/sk.po                                           | 2843 ++++++++++++--------
 src/CMakeLists.txt                                 |    1 +
 src/client/application/geary-controller.vala       |   18 +-
 src/client/components/main-toolbar.vala            |  303 ++-
 src/client/components/main-window.vala             |   46 +-
 src/client/components/pill-toolbar.vala            |    2 +-
 src/client/components/search-bar.vala              |  131 +
 src/client/composer/composer-box.vala              |   14 +
 src/client/composer/composer-headerbar.vala        |   82 +-
 src/client/composer/composer-widget.vala           |   26 +-
 src/client/composer/composer-window.vala           |   18 +-
 .../formatted-conversation-data.vala               |  102 +-
 src/client/util/util-email.vala                    |  109 +
 ui/composer.glade                                  |   16 +
 17 files changed, 3265 insertions(+), 2143 deletions(-)
---