Merge "Fix PHPCS warnings in /includes/mail/"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 28 Sep 2015 12:44:04 +0000 (12:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 28 Sep 2015 12:44:04 +0000 (12:44 +0000)

Trivial merge