Merge branch 'MDL-38170-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_...
commit26431c6f948a6636ebb3f64347c406a7a5767d1f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:26:07 +0000 (4 16:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:26:07 +0000 (4 16:26 +0100)
tree256f3d88db216d5771f7710872cf94c3a43eec4c
parent892ee7ee5636dfb6342913a778e227ce372312d7
parent850d33e658d6d4cc6ea8d3f8774fc7b5ff80fecb
Merge branch 'MDL-38170-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
lib/filelib.php