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)
commitf90977bcc58fd88a806a50ca2d3faad0ee2dab2e
tree71f31650c13391f289829cc0c1f1efe534e00e1c
parenta35aa213b80935dc1a068933c24ebd09cfea5737
parent40d7032f2924c09f2805d4490eecc126374e1456
Merge changes Ic13414f0,I26085bfc

* changes:
  Set visibility on class properties of ArchivedFile
  Set visibility on class properties of File
includes/filerepo/file/File.php