t / t5100 / rfc2047-info-0002on commit Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 (d9b0443)
   1Author: Olle Järnefors
   2Email: ojarnef@admin.kth.se
   3Subject: Time for ISO 10646?
   4