Merge "Do not support new installations via .php5 entrypoint any longer"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 12 Jun 2015 20:49:56 +0000 (20:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 12 Jun 2015 20:49:56 +0000 (20:49 +0000)
1  2 
includes/installer/Installer.php

Simple merge