[geary/wip/721828-undo-2: 3/3] Merge branch 'master' into wip/721828-undo-2

[Jim Nelson <jnelson src gnome org>]

commit aba61628244fce8c1b83cdbf0ef826f110d0a54b
Merge: aa0a383 e526528
Author: Jim Nelson <jim yorba org>
Date:   Mon Feb 2 17:48:18 2015 -0800

    Merge branch 'master' into wip/721828-undo-2

 src/client/application/geary-controller.vala       |   33 ++---
 src/client/components/main-window.vala             |    7 +-
 src/client/composer/composer-box.vala              |   21 +++-
 src/client/composer/composer-embed.vala            |   75 +++-------
 src/client/composer/composer-widget.vala           |    4 +-
 .../conversation-list/conversation-list-store.vala |  148 +++++++++++++-------
 .../formatted-conversation-data.vala               |    4 +-
 .../conversation-viewer/conversation-viewer.vala   |   22 ++-
 src/client/util/util-email.vala                    |    6 +-
 src/engine/api/geary-email.vala                    |   85 +++++++-----
 src/engine/app/app-conversation.vala               |  119 ++++++++++------
 .../imap-engine/imap-engine-email-prefetcher.vala  |    4 +-
 theming/message-viewer.css                         |   14 --
 13 files changed, 308 insertions(+), 234 deletions(-)
---