Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle

author Dan Poltawski <dan@moodle.com>

Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)

committer Dan Poltawski <dan@moodle.com>

Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)
author Dan Poltawski <dan@moodle.com>
Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)
committer Dan Poltawski <dan@moodle.com>
Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)
diff --cc course/format/renderer.php
Simple merge
diff --cc course/lib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)
		1	2
course/format/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history