Merge remote-tracking branch 'origin' into convertargs

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc docs/pending-release-notes
index 991b169678d9e5d7d26818baf7991955cd8734cf,c621ca1a1d6cc7e61a985b5784834484ed240a4c..4ae67075d0a88ec351d025391cde98c35fe84d77
--- 1/docs/pending-release-notes
--- 2/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@@ -25,14 -25,10 +25,15 @@@ NEW FEATURE
  - When building from source, configure will derive ${prefix} from an existing
    nmh installation if it finds one in your $PATH.
  - Added getmymbox and getmyaddr mh-format(5) function escapes.
- - The -changecur and -nochangecur switches have been added to mhfixmsg(1).
+ - New -changecur, -nochangecur, and -fixtype switches have been added
+   to mhfixmsg(1).
  - mhfixmsg now removes an extraneous trailing semicolon from header
    parameter lists.
 +- Added -convertargs switch to repl(1), to pass arguments to programs
 +  specified in the user's profile or mhn.defaults to convert message
 +  content.
 +- Added mhical(1), to display, reply to, and cancel iCalendar (RFC 5545)
 +  event requests.
  
  -----------------
  OBSOLETE FEATURES