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

Simple merge