Merge "CREDITS for This, That, and the other"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 18 Apr 2015 23:38:07 +0000 (23:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 18 Apr 2015 23:38:07 +0000 (23:38 +0000)

Trivial merge