[geary/wip/cx-reestablish: 7/8] Merge branch 'master' into wip/cx-reestablish

[Jim Nelson <jnelson src gnome org>]

commit 4ea2047bb332b0d1234b3e67ada9a715d5e88c14
Merge: 806bc7d 526f6e7
Author: Jim Nelson <jim yorba org>
Date:   Fri Jan 16 10:20:03 2015 -0800

    Merge branch 'master' into wip/cx-reestablish

 desktop/org.yorba.geary.gschema.xml                |    6 +
 src/CMakeLists.txt                                 |    1 +
 src/client/application/geary-config.vala           |    5 +
 src/client/application/geary-controller.vala       |    6 +-
 src/client/composer/composer-box.vala              |   74 ++++++++++++
 src/client/composer/composer-container.vala        |    1 +
 src/client/composer/composer-embed.vala            |   14 +--
 src/client/composer/composer-widget.vala           |  123 ++++++++++++++------
 src/client/composer/composer-window.vala           |    5 +
 src/client/composer/email-entry.vala               |   27 ++++-
 .../conversation-viewer/conversation-viewer.vala   |   19 +++-
 src/client/util/util-webkit.vala                   |    2 +-
 src/engine/rfc822/rfc822-message-data.vala         |    4 +-
 src/engine/rfc822/rfc822-utils.vala                |   37 +++++-
 14 files changed, 264 insertions(+), 60 deletions(-)
---