Merge "Update mailmap from USERINFO"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Sep 2015 07:06:28 +0000 (07:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Sep 2015 07:06:28 +0000 (07:06 +0000)

Trivial merge