[geary/wip/713846-plain-inline: 10/10] Merge branch 'master' into wip/713846-plain-inline

[Jim Nelson <jnelson src gnome org>]

commit aa3fe28408b560fd9599e06666c18a43bbf16566
Merge: f678c5e 1932f46
Author: Jim Nelson <jim yorba org>
Date:   Fri Jan 10 12:18:25 2014 -0800

    Merge branch 'master' into wip/713846-plain-inline

 .gitignore                                         |    1 +
 CMakeLists.txt                                     |    4 -
 INSTALL                                            |  131 ++-
 README                                             |   33 +-
 bindings/vapi/gmime-2.6.vapi                       |   22 +-
 bindings/vapi/gmime-2.6/gmime-2.6.metadata         |   10 +
 cmake/Gettext.cmake                                |   65 +-
 help/C/shortcuts.page                              |   10 +-
 po/CMakeLists.txt                                  |   48 +-
 po/LINGUAS                                         |   43 +
 po/POTFILES.in                                     |  360 +++++
 po/POTFILES.skip                                   |    1 +
 po/geary.pot                                       | 1501 --------------------
 src/CMakeLists.txt                                 |    7 -
 src/client/application/geary-application.vala      |   11 +-
 src/client/application/geary-controller.vala       |  184 ++-
 src/client/components/main-toolbar.vala            |   37 +-
 src/client/components/main-window.vala             |   28 +-
 src/client/components/pill-toolbar.vala            |    2 +-
 .../conversation-viewer/conversation-viewer.vala   |   10 +-
 .../conversation-viewer/conversation-web-view.vala |    8 +-
 src/client/util/util-webkit.vala                   |    5 +-
 src/engine/abstract/geary-abstract-account.vala    |    5 +-
 src/engine/api/geary-account.vala                  |    8 +
 src/engine/imap-db/imap-db-account.vala            |   13 +-
 .../gmail/imap-engine-gmail-account.vala           |    2 +-
 .../imap-engine/imap-engine-generic-account.vala   |    6 +-
 .../other/imap-engine-other-account.vala           |    2 +-
 .../outlook/imap-engine-outlook-account.vala       |    2 +-
 .../yahoo/imap-engine-yahoo-account.vala           |    2 +-
 theming/message-viewer.css                         |    2 +-
 ui/CMakeLists.txt                                  |    4 -
 32 files changed, 806 insertions(+), 1761 deletions(-)
---