Merge branch 'legacy_64' into legacy_6x

author Matthias Andree <matthias.andree@gmx.de>

Sun, 25 Aug 2019 15:25:33 +0000 (17:25 +0200)

committer Matthias Andree <matthias.andree@gmx.de>

Sun, 25 Aug 2019 15:25:33 +0000 (17:25 +0200)
author Matthias Andree <matthias.andree@gmx.de>
Sun, 25 Aug 2019 15:25:33 +0000 (17:25 +0200)
committer Matthias Andree <matthias.andree@gmx.de>
Sun, 25 Aug 2019 15:25:33 +0000 (17:25 +0200)
diff --cc NEWS
Simple merge
diff --cc unmime.c
Simple merge
author	Matthias Andree <matthias.andree@gmx.de>
	Sun, 25 Aug 2019 15:25:33 +0000 (17:25 +0200)
committer	Matthias Andree <matthias.andree@gmx.de>
	Sun, 25 Aug 2019 15:25:33 +0000 (17:25 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
unmime.c	patch \|	diff1 \|	diff2 \|	blob \| history