Merge "Update formatting"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 Nov 2013 20:29:43 +0000 (20:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 19 Nov 2013 20:29:43 +0000 (20:29 +0000)

Trivial merge