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

[Jeffrey Stedfast <fejj src gnome org>]

commit 7fff1a3e4a0e4a820da078cc9f2af8ecf10b7452
Merge: a9d2e09 dfadf1d
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Thu Mar 30 11:47:41 2017 -0400

    Merge branch 'master' into gnome-master

 docs/reference/gmime-sections.txt    |   21 +++++++++++++++++++++
 gmime/GMime-3.0.metadata             |    5 -----
 gmime/gmime-application-pkcs7-mime.c |   24 +++++++++++++++++-------
 gmime/gmime-content-type.c           |    8 ++++----
 gmime/gmime-crypto-context.c         |    2 +-
 gmime/gmime-disposition.c            |   10 +++++-----
 gmime/gmime-format-options.c         |   21 +++++++++++++++++++--
 gmime/gmime-format-options.h         |    7 ++++++-
 gmime/gmime-header.c                 |   34 +++++++++++++++++-----------------
 gmime/gmime-internal.h               |    1 -
 gmime/gmime-message.c                |   12 ++++++------
 gmime/gmime-multipart-encrypted.c    |    6 +++---
 gmime/gmime-multipart-signed.c       |    6 +++---
 gmime/gmime-object.c                 |    2 +-
 gmime/gmime-param.c                  |   10 +++++-----
 gmime/gmime-parser-options.c         |   13 ++++++++-----
 gmime/gmime-parser-options.h         |    8 ++++++++
 gmime/gmime-part-iter.c              |   29 +++++++++++++++++++++++++++++
 gmime/gmime-part-iter.h              |    6 ++++++
 gmime/gmime-references.c             |    3 ++-
 gmime/gmime-references.h             |    5 ++---
 gmime/gmime-stream-file.c            |    4 ++--
 gmime/gmime-stream-fs.c              |    4 ++--
 gmime/gmime-utils.c                  |   34 +++++++++++++++++-----------------
 tests/test-mime.c                    |    2 +-
 25 files changed, 185 insertions(+), 92 deletions(-)
---