Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)
diff --cc lib/filelib.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
diff --cc lib/tests/moodlelib_test.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)
		1	2
lib/filelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/tests/moodlelib_test.php	patch \|	diff1 \|	diff2 \|	blob \| history