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

[Jim Nelson <jnelson src gnome org>]

commit deb61ecf4036bc850e350a7d0f31779b089fb9d6
Merge: cd43ff1 c95f44f
Author: Jim Nelson <jim yorba org>
Date:   Sun Oct 11 11:43:14 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 THANKS                                             |    1 +
 debian/control                                     |    3 +-
 help/de/de.po                                      |  185 +-
 po/cs.po                                           |   16 +-
 po/de.po                                           |  576 +++--
 po/es.po                                           |  280 +-
 po/fi.po                                           |  424 ++--
 po/fr.po                                           |  562 ++--
 po/he.po                                           |   19 +-
 po/hu.po                                           |   13 +-
 po/it.po                                           |   15 +-
 po/lt.po                                           |  574 +++--
 po/nb.po                                           |  717 +++---
 po/pl.po                                           |   74 +-
 po/pt.po                                           | 3055 ++++++++++++--------
 po/ru.po                                           |   13 +-
 po/sk.po                                           |   41 +-
 po/sv.po                                           |   47 +-
 po/tr.po                                           |  530 ++--
 .../folder-list/folder-list-folder-entry.vala      |    1 +
 src/engine/api/geary-account-information.vala      |   14 +
 .../imap-engine/imap-engine-generic-account.vala   |    7 +
 .../other/imap-engine-other-account.vala           |    2 +-
 .../other/imap-engine-other-folder.vala            |   21 +-
 .../imap/response/imap-mailbox-attributes.vala     |    5 +-
 25 files changed, 4151 insertions(+), 3044 deletions(-)
---