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

[Jeffrey Stedfast <fejj src gnome org>]

commit 12be594eb00149d09b4baf5424c376c1808c230f
Merge: edd2dd9 7d98290
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Tue Mar 28 19:46:29 2017 -0400

    Merge branch 'master' into gnome-master

 gmime/gmime-gpg-context.c                          |    2 +
 gmime/gmime-references.c                           |    8 +-
 tests/Makefile.am                                  |    4 +-
 .../input/photo-discuss/message-partial.0.eml      |  865 +++++++
 .../input/photo-discuss/message-partial.1.eml      |  850 +++++++
 .../input/photo-discuss/message-partial.2.eml      |  751 ++++++
 tests/data/partial/input/skippy/message-partial.1  | 2055 -----------------
 tests/data/partial/input/skippy/message-partial.2  |  Bin 4384 -> 0 bytes
 tests/data/partial/output/photo-discuss            | 2439 ++++++++++++++++++++
 tests/data/partial/output/skippy                   | 2090 -----------------
 tests/test-mime.c                                  |   69 +
 tests/test1.eml                                    |  453 ----
 tests/test2.eml                                    |  819 -------
 tests/test3.eml                                    |  106 -
 14 files changed, 4982 insertions(+), 5529 deletions(-)
---