Merge branch '1.2.x' into 1.3.x
[catacomb-python] / .mailmap
CommitLineData
760dbe1d 1Mark Wooding <mdw@distorted.org.uk> <mdw>