Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)
commit37027f431b306acfb8feac8f6c70af7aaa4ad373
tree84ccb66bb2275835e0469f5cf2a41a43d81bd5b6
parent0774b0d34c906874d3fe8ea2afb4c093ccffb68c
parentcaf16a57e56373a938eddce2030249a2e1648559
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
lib/filelib.php
lib/moodlelib.php
lib/tests/moodlelib_test.php