Merge branch 'wip-MDL-34063-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 16:34:27 +0000 (18:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 16:34:27 +0000 (18:34 +0200)
commit2fba8f5a927773d551b5b5b7a66e0cb2f6b43d10
treea195cc6012fa19e7b4f992723185a00e397c902b
parent483afa446df3bbf685808316a6ea023e77bc2951
parentc7aed1e11bf0cb2abb5150dc82e51cb6f6b19842
Merge branch 'wip-MDL-34063-master' of git://github.com/marinaglancy/moodle
lib/filelib.php