t / t5100 / rfc2047-info-0003on commit Merge branch 'jc/combine-diff-many-parents' (4dd7c77)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4