Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 07:23:19 +0000 (15:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 07:23:19 +0000 (15:23 +0800)
1  2 
lib/filestorage/file_storage.php

Simple merge