Merge "Improve OutputPage::showErrorPage method documentation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 Jan 2014 16:00:44 +0000 (16:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Jan 2014 16:00:44 +0000 (16:00 +0000)

Trivial merge