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

[Jim Nelson <jnelson src gnome org>]

commit b6f7589caab50e674b084f03702e1c75f10937c5
Merge: 451ddc6 cb7ea1b
Author: Jim Nelson <jim yorba org>
Date:   Wed Mar 4 18:01:38 2015 -0800

    Merge branch 'master' into wip/713150-conversations

 po/POTFILES.in                                     |   11 +-
 po/fr.po                                           |  965 +++++++++++++-------
 src/CMakeLists.txt                                 |    1 +
 .../accounts/account-dialog-add-edit-pane.vala     |    5 +-
 .../account-dialog-edit-alternate-emails-pane.vala |  205 +++++
 src/client/accounts/account-dialog.vala            |   17 +
 src/client/accounts/add-edit-page.vala             |   11 +
 src/client/composer/composer-widget.vala           |  175 +++-
 .../conversation-list/conversation-list-store.vala |    3 +-
 .../formatted-conversation-data.vala               |   37 +-
 src/engine/api/geary-account-information.vala      |  108 +++-
 src/engine/api/geary-composed-email.vala           |    2 +
 src/engine/imap-db/outbox/smtp-outbox-folder.vala  |    2 +-
 .../imap-engine-abstract-list-email.vala           |   61 ++
 src/engine/rfc822/rfc822-mailbox-address.vala      |   57 +-
 src/engine/rfc822/rfc822-mailbox-addresses.vala    |   39 +-
 src/engine/rfc822/rfc822-utils.vala                |   52 +-
 src/engine/util/util-string.vala                   |    4 +
 ui/CMakeLists.txt                                  |    1 +
 ui/edit_alternate_emails.glade                     |  196 ++++
 ui/login.glade                                     |  161 ++--
 21 files changed, 1574 insertions(+), 539 deletions(-)
---