Merge "Allow reset of global services (redux)."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 4 May 2016 22:07:44 +0000 (22:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 4 May 2016 22:07:44 +0000 (22:07 +0000)
1  2 
includes/GlobalFunctions.php
includes/installer/Installer.php

Simple merge
Simple merge