Merge branch 'MDL-58720-master' of git://github.com/jleyva/moodle

author Jun Pataleta <jun@moodle.com>

Mon, 1 May 2017 02:47:52 +0000 (10:47 +0800)

committer Jun Pataleta <jun@moodle.com>

Mon, 1 May 2017 02:47:52 +0000 (10:47 +0800)
author Jun Pataleta <jun@moodle.com>
Mon, 1 May 2017 02:47:52 +0000 (10:47 +0800)
committer Jun Pataleta <jun@moodle.com>
Mon, 1 May 2017 02:47:52 +0000 (10:47 +0800)
diff --cc course/externallib.php
Simple merge
diff --cc course/tests/externallib_test.php
Simple merge
diff --cc course/upgrade.txt
Simple merge
author	Jun Pataleta <jun@moodle.com>
	Mon, 1 May 2017 02:47:52 +0000 (10:47 +0800)
committer	Jun Pataleta <jun@moodle.com>
	Mon, 1 May 2017 02:47:52 +0000 (10:47 +0800)
		1	2
course/externallib.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/tests/externallib_test.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/upgrade.txt	patch \|	diff1 \|	diff2 \|	blob \| history