Merge "installer: Read from extension.json if possible"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Apr 2015 16:14:35 +0000 (16:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Apr 2015 16:14:35 +0000 (16:14 +0000)
1  2 
includes/installer/Installer.php

Simple merge