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

[Jeffrey Stedfast <fejj src gnome org>]

commit 2ffbf1bc0474e1f6b0b265370a2126093f3168d5
Merge: 1732dfd 8454d1b
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Sat Apr 1 11:00:44 2017 -0400

    Merge branch 'master' into gnome-master

 gmime/gmime-application-pkcs7-mime.c |    2 +-
 gmime/gmime-certificate.c            |    4 ++--
 gmime/gmime-content-type.c           |    4 ++--
 gmime/gmime-crypto-context.c         |    2 +-
 gmime/gmime-data-wrapper.c           |    2 +-
 gmime/gmime-disposition.c            |    4 ++--
 gmime/gmime-filter-basic.c           |    2 +-
 gmime/gmime-filter-best.c            |   10 +++++-----
 gmime/gmime-filter-charset.c         |   12 ++++++------
 gmime/gmime-filter-checksum.c        |    4 ++--
 gmime/gmime-filter-dos2unix.c        |    2 +-
 gmime/gmime-filter-enriched.c        |    8 ++++----
 gmime/gmime-filter-from.c            |   12 ++++++------
 gmime/gmime-filter-gzip.c            |   16 ++++++++--------
 gmime/gmime-filter-html.c            |    2 +-
 gmime/gmime-filter-smtp-data.c       |    2 +-
 gmime/gmime-filter-strip.c           |    2 +-
 gmime/gmime-filter-unix2dos.c        |    2 +-
 gmime/gmime-filter-windows.c         |    2 +-
 gmime/gmime-filter-yenc.c            |    2 +-
 gmime/gmime-gpg-context.c            |    2 +-
 gmime/gmime-header.c                 |    4 ++--
 gmime/gmime-message-part.c           |    4 ++--
 gmime/gmime-message-partial.c        |   14 +++++++-------
 gmime/gmime-message.c                |    2 +-
 gmime/gmime-multipart-encrypted.c    |    2 +-
 gmime/gmime-multipart-signed.c       |    4 ++--
 gmime/gmime-multipart.c              |   19 ++++---------------
 gmime/gmime-object.c                 |    4 ++--
 gmime/gmime-param.c                  |    4 ++--
 gmime/gmime-parser.c                 |    2 +-
 gmime/gmime-part.c                   |   15 +++------------
 gmime/gmime-pkcs7-context.c          |    2 +-
 gmime/gmime-signature.c              |    4 ++--
 gmime/gmime-stream-buffer.c          |    4 ++--
 gmime/gmime-stream-cat.c             |    6 +++---
 gmime/gmime-stream-file.c            |   20 ++++++++++----------
 gmime/gmime-stream-filter.c          |    4 ++--
 gmime/gmime-stream-fs.c              |   14 +++++++-------
 gmime/gmime-stream-gio.c             |   14 +++++++-------
 gmime/gmime-stream-mem.c             |   20 ++++++++------------
 gmime/gmime-stream-mmap.c            |   16 +++++++---------
 gmime/gmime-stream-null.c            |    4 ++--
 gmime/gmime-stream-pipe.c            |   14 +++++++++++---
 gmime/gmime-text-part.c              |    8 ++++----
 gmime/internet-address.c             |    6 +++---
 46 files changed, 145 insertions(+), 163 deletions(-)
---