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

[Jeffrey Stedfast <fejj src gnome org>]

commit a4dfcd3966743f8507e8e2f530d746dc5bc590cc
Merge: b3b9e0d ad5366d
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Tue Mar 21 18:24:58 2017 -0400

    Merge branch 'master' into gnome-master

 build/vs2010/gmime.vcxproj  |   54 ++++++---
 gmime/gmime-header.c        |    2 -
 gmime/gmime-iconv-utils.c   |  128 +++++++------------
 gmime/gmime-iconv.c         |  293 +------------------------------------------
 gmime/gmime-iconv.h         |    6 +-
 gmime/gmime-stream-buffer.c |  276 +++++------------------------------------
 gmime/gmime-stream-buffer.h |    2 -
 gmime/gmime.c               |    9 +--
 tests/test-iconv.c          |   83 +------------
 tests/test-streams.c        |   67 ++---------
 util/Makefile.am            |    4 -
 util/cache.c                |  128 -------------------
 util/cache.h                |   68 ----------
 util/list.c                 |  118 -----------------
 util/list.h                 |   59 ---------
 15 files changed, 133 insertions(+), 1164 deletions(-)
---