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

[Jim Nelson <jnelson src gnome org>]

commit a71a3b328957a5ea10557b903554e13e878e228a
Merge: 5b1ab0d 98be06d
Author: Jim Nelson <jim yorba org>
Date:   Fri Mar 20 16:05:07 2015 -0700

    Merge branch 'master' into wip/713150-conversations
    
    Conflicts:
        src/client/application/geary-controller.vala

 po/hu.po                                     |  377 ++++++++++++++------------
 src/client/application/geary-controller.vala |    6 +-
 src/client/components/main-toolbar.vala      |   52 +++--
 src/client/components/main-window.vala       |   12 +-
 src/client/components/pill-toolbar.vala      |   17 ++
 src/client/composer/composer-box.vala        |    5 -
 src/client/composer/composer-headerbar.vala  |   28 +-
 src/client/composer/composer-widget.vala     |    1 +
 ui/composer.glade                            |    7 +
 ui/toolbar_menu.ui                           |   13 -
 10 files changed, 294 insertions(+), 224 deletions(-)
---
diff --cc src/client/application/geary-controller.vala
index fdbb8fa,27724bc..dfc9c2e
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@@ -98,8 -98,8 +98,10 @@@ public class GearyController : Geary.Ba
      
      public LoginDialog? login_dialog { get; private set; default = null; }
      
 +    public ConversationListCellDimensions cell_dimensions = new ConversationListCellDimensions();
 +    
+     public MenuModel app_menu { get; private set; }
+     
      private Geary.Account? current_account = null;
      private Gee.HashMap<Geary.Account, Geary.App.EmailStore> email_stores
          = new Gee.HashMap<Geary.Account, Geary.App.EmailStore>();