[geary/bug/7629-reorg: 22/22] Merge branch 'master' into bug/7629-reorg

[Jim Nelson <jnelson src gnome org>]

commit eee8c5350ecc63122803ae870720ba85e0c98b3f
Merge: 2b29bcd 1a48ccc
Author: Jim Nelson <jim yorba org>
Date:   Mon Nov 25 17:28:00 2013 -0800

    Merge branch 'master' into bug/7629-reorg

 CMakeLists.txt                                     |    2 +-
 NEWS                                               |   18 +
 .../metadata/webkitgtk-2.0/WebKit-3.0.metadata     |    5 +
 .../metadata/webkitgtk-2.2/WebKit-3.0.metadata     |   11 +
 bindings/vapi/gmime-2.6.vapi                       |    4 +-
 bindings/vapi/gmime-2.6/gmime-2.6.metadata         |    2 +
 bindings/vapi/libnotify.vapi                       |   73 +
 debian/changelog                                   |   18 +
 geary.doap                                         |   31 +
 po/CMakeLists.txt                                  |   21 +-
 po/ar.po                                           |    2 +-
 po/ca.po                                           |    2 +-
 po/ca_ES.po                                        | 1518 --------------------
 po/cs.po                                           |  263 ++--
 po/da.po                                           |    2 +-
 po/de.po                                           |    2 +-
 po/{el_GR.po => el.po}                             |    4 +-
 po/en_CA.po                                        |    2 +-
 po/en_GB.po                                        |    2 +-
 po/eo.po                                           |    2 +-
 po/es.po                                           |    2 +-
 po/es_ES.po                                        | 1515 -------------------
 po/et.po                                           |    2 +-
 po/{es_419.po => eu.po}                            |   10 +-
 po/{ms_MY.po => fa.po}                             |  685 +++++-----
 po/fi.po                                           |   45 +-
 po/fr.po                                           |    2 +-
 po/gl.po                                           |    2 +-
 po/he.po                                           |   14 +-
 po/{hi_IN.po => hi.po}                             |    2 +-
 po/hr.po                                           |  272 ++--
 po/{hu_HU.po => hu.po}                             |    2 +-
 po/id.po                                           |    2 +-
 po/it.po                                           |    2 +-
 po/{ja_JP.po => ja.po}                             |    2 +-
 po/{km_KH.po => km.po}                             |    2 +-
 po/{ro_RO.po => lt.po}                             |  692 +++++-----
 po/{ms_MY.po => ms.po}                             |    2 +-
 po/nb.po                                           |    2 +-
 po/{nl_NL.po => nl.po}                             |    2 +-
 po/pl.po                                           |   26 +-
 po/pt.po                                           |    2 +-
 po/pt_BR.po                                        |  249 ++--
 po/ro.po                                           |  585 ++++----
 po/ru.po                                           |   71 +-
 po/sk.po                                           |    2 +-
 po/sl.po                                           |    2 +-
 po/sr.po                                           |    2 +-
 po/sv.po                                           |   42 +-
 po/te.po                                           |    2 +-
 po/tr.po                                           |    2 +-
 po/uk.po                                           |   23 +-
 po/vi.po                                           |    2 +-
 po/zh_CN.po                                        |  128 +-
 po/zh_TW.po                                        |    2 +-
 src/CMakeLists.txt                                 |    7 +
 src/client/components/main-toolbar.vala            |    6 +-
 src/client/composer/composer-window.vala           |    8 +
 .../conversation-viewer/conversation-viewer.vala   |   45 +-
 .../conversation-viewer/conversation-web-view.vala |   12 +-
 src/client/notification/libnotify.vala             |    2 +-
 src/console/main.vala                              |   50 +
 src/engine/api/geary-attachment.vala               |   50 +-
 src/engine/app/app-conversation-monitor.vala       |  111 --
 src/engine/imap-db/imap-db-attachment.vala         |    6 +-
 src/engine/imap-db/imap-db-database.vala           |    4 +-
 src/engine/imap-db/imap-db-folder.vala             |   16 +-
 .../imap-engine/imap-engine-generic-folder.vala    |   29 +-
 src/engine/imap/api/imap-account.vala              |   49 +-
 src/engine/imap/command/imap-list-command.vala     |   14 +
 .../imap/transport/imap-client-connection.vala     |    4 +-
 src/engine/imap/transport/imap-client-session.vala |   60 +-
 src/engine/mime/mime-content-disposition.vala      |  108 ++
 src/engine/mime/mime-content-parameters.vala       |  114 ++
 src/engine/mime/mime-content-type.vala             |  199 +++
 src/engine/mime/mime-data-format.vala              |   45 +
 src/engine/mime/mime-disposition-type.vala         |   87 ++
 src/engine/mime/mime-error.vala                    |   13 +
 src/engine/rfc822/rfc822-message-data.vala         |   23 +-
 src/engine/rfc822/rfc822-message.vala              |  106 +-
 ui/composer.glade                                  |    2 -
 81 files changed, 2698 insertions(+), 4855 deletions(-)
---