t / t5100 / rfc2047-info-0004on commit Merge branch 'jc/maint-add-u-remove-conflicted' (f39e4cf)
   1Author: Nathaniel Borenstein (םולש ןב ילטפנ)
   2Email: nsb@thumper.bellcore.com
   3Subject: Test of new header generator
   4