From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 16 Jan 2017 20:03:11 +0000 (+0000)
Subject: Merge "Update .mailmap for the generation of CREDITS"
X-Git-Tag: 1.31.0-rc.0~4316
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=38b0060dc4306291e0cd78acdf45a83d5324e5b3;p=lhc%2Fweb%2Fwiklou.git

Merge "Update .mailmap for the generation of CREDITS"
---

38b0060dc4306291e0cd78acdf45a83d5324e5b3