Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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

Wed, 22 Aug 2012 06:40:02 +0000 (08:40 +0200)

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

Wed, 22 Aug 2012 06:40:02 +0000 (08:40 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 06:40:02 +0000 (08:40 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 06:40:02 +0000 (08:40 +0200)
diff --cc course/format/renderer.php
Simple merge
diff --cc course/view.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 22 Aug 2012 06:40:02 +0000 (08:40 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 22 Aug 2012 06:40:02 +0000 (08:40 +0200)
		1	2
course/format/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/view.php	patch \|	diff1 \|	diff2 \|	blob \| history