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