t / t5100 / rfc2047-info-0006on commit Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 (d9b0443)
   1Subject: (a b)
   2