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

[Jeffrey Stedfast <fejj src gnome org>]

commit a9d2e09f558d10eff5b7b4e9ad01137e41c0f0ee
Merge: 12be594 ac2ba25
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Thu Mar 30 08:59:01 2017 -0400

    Merge branch 'master' into gnome-master

 gmime/gmime-crypto-context.h |    4 +-
 gmime/gmime-header.c         |   85 +++++++++++++++++++++++++++++++++++++++++-
 gmime/gmime-references.c     |    4 +-
 tests/test-headers.c         |   56 +++++++++++++++++++++++++++
 4 files changed, 145 insertions(+), 4 deletions(-)
---