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)
1  2 
lib/filelib.php
lib/moodlelib.php
lib/tests/moodlelib_test.php

diff --cc lib/filelib.php
Simple merge
Simple merge
Simple merge