Merge branch 'MDL-35141-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
commit5cb3d27681a279237820cc0c8b084c85a211cfb0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:47:11 +0000 (9 00:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:47:11 +0000 (9 00:47 +0200)
tree608a551d74912f93c18308ab69c683c8046d43d7
parent57ca2e437569d8e07e42bbb40d5dd948210f636a
parentd6d63941d7e5f2ebcf9e8714a692884d52badac3
Merge branch 'MDL-35141-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
lib/filelib.php