Merge "Removed unused getZoneHandlerUrl() method"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 May 2014 18:25:07 +0000 (18:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 May 2014 18:25:07 +0000 (18:25 +0000)
1  2 
includes/DefaultSettings.php
includes/filerepo/FileRepo.php

Simple merge
Simple merge