From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 25 May 2015 19:37:32 +0000 (+0000)
Subject: Merge "Provide a .mailmap file to make git log/etc. cleaner"
X-Git-Tag: 1.31.0-rc.0~11288
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=ddd22c25d7a26a9c2a65a341a41730282d51163a;p=lhc%2Fweb%2Fwiklou.git

Merge "Provide a .mailmap file to make git log/etc. cleaner"
---

ddd22c25d7a26a9c2a65a341a41730282d51163a