Merge "Whitespace cleanups"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 31 Mar 2016 00:52:39 +0000 (00:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 31 Mar 2016 00:52:39 +0000 (00:52 +0000)

Trivial merge