Merge "Use wiki email for From of CC messages when $wgUserEmailUseReplyTo is set"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 31 Aug 2016 20:28:48 +0000 (20:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 31 Aug 2016 20:28:48 +0000 (20:28 +0000)

Trivial merge