Merge "Removed deprecated functions and merged ProxyTools into GlobalFunctions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 20 Dec 2013 19:29:42 +0000 (19:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 20 Dec 2013 19:29:42 +0000 (19:29 +0000)
1  2 
includes/Setup.php

Simple merge