Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle

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

Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)

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

Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)
diff --cc admin/renderer.php
Simple merge
diff --cc lib/filelib.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 9 Oct 2012 22:35:11 +0000 (00:35 +0200)
		1	2
admin/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/filelib.php	patch \|	diff1 \|	diff2 \|	blob \| history