Merge branch 'welcome'

diff --cc docs/pending-release-notes
index bec2a5aed103460845eea2022d85897e492691a9,74580e8925abc72d89b446f6fc0b52fad69fe5e0..e5ae089909d0c2455bcdd1fbb8cfc36a0fcbc8c2
--- 1/docs/pending-release-notes
--- 2/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@@ -52,12 -52,7 +52,13 @@@ NEW FEATURE
  - Support for SMTPUTF8 (RFC 6531) has been added.  mhshow(1) already supported
    RFC 6532, assuming all 8-bit message header field bodies are UTF-8 and use
    of a UTF-8 locale.
 +- mhfixmsg now replaces RFC 2047 encoding with RFC 2231 encoding of name and
 +  filename parameters in Content-Type and Content-Disposition headers,
 +  respectively.
 +- If a message body contains 8-bit bytes, post(8) uses SMTP 8BITMIME if the
 +  server supports it.  If not, post fails with a message to the user to
 +  encode the message for 7-bit transport.
+ - Added welcome message when nmh detects that its version changed.
  
  -----------------
  OBSOLETE FEATURES

diff --cc test/common.sh.in
Simple merge

diff --cc uip/mhfixmsg.c
Simple merge