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

[Jeffrey Stedfast <fejj src gnome org>]

commit 1732dfd5bdcbb430cdf3515ee900ed5867435d7a
Merge: 007d557 fb19ffa
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Fri Mar 31 13:06:21 2017 -0400

    Merge branch 'master' into gnome-master

 TODO                       |    3 --
 gmime/gmime-message-part.c |   39 +++++++++++++++++++++++++++++++--
 gmime/gmime-message.c      |    1 +
 gmime/gmime-message.h      |    1 +
 gmime/gmime-parser.c       |   50 ++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 82 insertions(+), 12 deletions(-)
---