Merge changes Ic13414f0,I26085bfc
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Nov 2013 20:11:11 +0000 (20:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Nov 2013 20:11:11 +0000 (20:11 +0000)
* changes:
  Set visibility on class properties of ArchivedFile
  Set visibility on class properties of File

1  2 
includes/filerepo/file/File.php

Simple merge