Merge "Remove $wgProxyKey"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 11 Jun 2014 23:30:07 +0000 (23:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 11 Jun 2014 23:30:07 +0000 (23:30 +0000)

Trivial merge