Merge "Update CREDITS and .mailmap" into REL1_31
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 18 Apr 2018 01:50:14 +0000 (01:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 18 Apr 2018 01:50:14 +0000 (01:50 +0000)
commitb91529b736c45f0a0df6fddddd1efd82c9de4200
treea9081ebdbc3b216cdeef93eb7aa95532f41c2aa5
parent5a166c2a550152e4bcae799c9be7f06fa2a2278d
parent4b424910ce597b04d703765a41b40de4ab93dcc6
Merge "Update CREDITS and .mailmap" into REL1_31