Merge "Use config instead of globals for OutputPage"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 23 Aug 2014 20:21:44 +0000 (20:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 23 Aug 2014 20:21:44 +0000 (20:21 +0000)
1  2 
includes/OutputPage.php

Simple merge