[gmime: 12/12] Merge branch 'master' into gnome-master

[Jeffrey Stedfast <fejj src gnome org>]

commit b80cb3455b968067eb979f4d6260e57dabe90626
Merge: 952eb45 110e90e
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Thu Apr 6 20:40:36 2017 -0400

    Merge branch 'master' into gnome-master

 docs/reference/question_index.sgml |    4 ++--
 docs/tutorial/gmime-tut.sgml       |   29 +++++++++++------------------
 examples/basic-example.c           |   16 +++++++---------
 examples/imap-example.c            |    8 ++------
 examples/uudecode.c                |    6 +++---
 gmime/gmime-gpgme-utils.c          |    2 +-
 gmime/gmime-header.c               |    2 +-
 gmime/gmime-param.c                |    7 +------
 gmime/gmime-parser.c               |    4 ++--
 gmime/gmime-stream-file.c          |   14 ++++++++++----
 gmime/gmime-stream-fs.c            |   13 +++++++++----
 tests/test-mbox.c                  |    3 ++-
 tests/test-smime.c                 |    6 ++++--
 tests/test-streams.c               |    1 -
 14 files changed, 55 insertions(+), 60 deletions(-)
---