From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 18 Apr 2018 01:24:01 +0000 (+0000)
Subject: Merge "Update CREDITS and .mailmap"
X-Git-Tag: 1.34.0-rc.0~5704
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/%28%5B%5E/%27%20.%20%24_credit%5B%27url%27%5D%20.%20%27?a=commitdiff_plain;h=a99e1f8442a66ca422eb7f958cd3367001a0c47a;p=lhc%2Fweb%2Fwiklou.git

Merge "Update CREDITS and .mailmap"
---

a99e1f8442a66ca422eb7f958cd3367001a0c47a