Merge "Less wild whitespace"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 10 Dec 2012 15:12:49 +0000 (15:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 10 Dec 2012 15:12:49 +0000 (15:12 +0000)

Trivial merge