Merge branch 'wip-MDL-59411-master' of git://github.com/marinaglancy/moodle

author David Monllao <david.monllao@gmail.com>

Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)

committer David Monllao <david.monllao@gmail.com>

Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)
author David Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)
committer David Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)
diff --cc course/renderer.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
author	David Monllao <david.monllao@gmail.com>
	Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)
committer	David Monllao <david.monllao@gmail.com>
	Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)
		1	2
course/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history