[geary/wip/737642-uint: 3/3] Merge branch 'master' into wip/737642-uint

[Jim Nelson <jnelson src gnome org>]

commit af3f95c5faf1bfba3ddf21ad17a5c2225f46cc6f
Merge: 2b48c2f cbb21b2
Author: Jim Nelson <jim yorba org>
Date:   Fri Nov 14 14:00:40 2014 -0800

    Merge branch 'master' into wip/737642-uint

 configure                                     |    6 ------
 debian/rules                                  |    2 +-
 src/CMakeLists.txt                            |   10 ----------
 src/client/application/geary-application.vala |    7 +++++++
 src/client/components/main-window.vala        |   14 +++++++-------
 src/client/components/pill-toolbar.vala       |    5 ++---
 src/client/composer/composer-window.vala      |   23 +++++++++++------------
 src/engine/rfc822/rfc822-message-data.vala    |    4 ++--
 8 files changed, 30 insertions(+), 41 deletions(-)
---