Merge branch 'MDL-49598-master' of git://github.com/andrewnicols/moodle
commit6cb65683d1c0b297f7c2c3913267abe57df4e982
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:21:37 +0000 (31 14:21 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:21:37 +0000 (31 14:21 +0100)
tree1a282973bfb5a1fec5f642871223c26d5f82b719
parent8a39f66130ecfeb30c4eb16bd12057c9ad23e236
parent5d70615157ecf269e88a0a2d851528404599f19d
Merge branch 'MDL-49598-master' of git://github.com/andrewnicols/moodle
lib/filestorage/file_storage.php