getpelican/pelican — pull request #839 by wking (2013-04-12 14:57:32+00:00)
Title: .mailmap: Add mappings to consolidate author names and emails

See "MAPPING AUTHORS" in git-shortlog(1) for syntax details.

I don't think I've accidentally merged two distinct people together, but I
added

Guillaume B

to avoid someone accidentally merging him into

Guillaume

I'm pretty sure these are two different Guillaumes.