Merge "Provide a .mailmap file to make git log/etc. cleaner"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 25 May 2015 19:37:32 +0000 (19:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 May 2015 19:37:32 +0000 (19:37 +0000)

Trivial merge