From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 14 Mar 2017 15:09:56 +0000 (+0000)
Subject: Merge "Update CREDITS and .mailmap files"
X-Git-Tag: 1.31.0-rc.0~3820
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=7722acc0ddc467a1c0edcdcf08a240e19e38232c;p=lhc%2Fweb%2Fwiklou.git

Merge "Update CREDITS and .mailmap files"
---

7722acc0ddc467a1c0edcdcf08a240e19e38232c