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)
1  2 
lib/filestorage/file_storage.php

Simple merge