Merge "Cleanups to MigrateFileRepoLayout"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 Oct 2015 23:50:38 +0000 (23:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 Oct 2015 23:50:38 +0000 (23:50 +0000)
1  2 
includes/filerepo/file/File.php
includes/filerepo/file/LocalFile.php

Simple merge
Simple merge