Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:17:12 +0000 (18:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:17:12 +0000 (18:17 +0100)
commitceda80962ce8e262ba57dd1def76f953c005c1f0
treeda505388939f5df01309e52f6de6dd6bb438818e
parent62a96046777e9e4d09a859d4c68830239a5879aa
parentaebe9db07fa672f8c1096ee662b05cf8e11c898a
Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle
lib/filelib.php