Merge branch '2.4.x' into 2.5.x
[catacomb] / .mailmap
1 Mark Wooding <mdw@distorted.org.uk> <mdw>