Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:25:00 +0000 (16:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:25:00 +0000 (16:25 +0100)
commitd5834b37121167b9020c2a9efc1c84203264e669
treeef840e483464aadd817b914c2474daa814e4eff5
parent486f9dbecc39f17a259668d573b6748cff235589
parent85cb4b65b1b815a9747867fc082394a884639a2c
Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle
lib/filelib.php