Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle

author Sam Hemelryk <sam@moodle.com>

Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)

committer Sam Hemelryk <sam@moodle.com>

Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)
author Sam Hemelryk <sam@moodle.com>
Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)
committer Sam Hemelryk <sam@moodle.com>
Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)
diff --cc course/renderer.php
Simple merge
diff --cc mod/forum/post.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)
committer	Sam Hemelryk <sam@moodle.com>
	Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)
		1	2
course/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/forum/post.php	patch \|	diff1 \|	diff2 \|	blob \| history