Merge branch '2.5.x'
[catacomb] / .mailmap
2017-08-15 Mark Wooding.mailmap: Add file to fix CVS-ish names in history.