Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 02:41:41 +0000 (10:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 02:41:41 +0000 (10:41 +0800)
commit47d333857da144a06b82cd5214148b820868c705
tree186cd80a5e7ca691e16e3bb1f1c12b305f80e4a6
parent4d9dda23895f5c5b97b5bffeb63d5f94edb5ea25
parent7a79030f48ce090107dc264114447a628289bd9d
Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle
lib/filestorage/file_storage.php