Commit 3a2a511be3ae225e5c5a3d38f65d672805ec99cd

Vicent Martí 2013-04-21T05:48:08

Merge pull request #1494 from nulltoken/fix/mailmap mailmap: Coalesce some identities