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)
commit61725199a9a805f3a36c781e26d5c5ff97051034
treea392360397fa9ebc9cd789c26771f5cfb8e66bce
parentbbd045b9e6be42c4507ae09b3a75878840942f05
parent3385a89c38ff979866dd5fdc80664739ea335ec7
Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle
lib/filestorage/file_storage.php