Merge "Separate startUp() call from main script of mediawiki module"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 10 Feb 2015 10:49:48 +0000 (10:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 10 Feb 2015 10:49:48 +0000 (10:49 +0000)
1  2 
resources/Resources.php

Simple merge