Merge "whitespace fixup"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 May 2014 23:29:11 +0000 (23:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 21 May 2014 23:29:11 +0000 (23:29 +0000)

Trivial merge