Merge "Update formatting"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 6 Feb 2014 08:33:51 +0000 (08:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Feb 2014 08:33:51 +0000 (08:33 +0000)

Trivial merge