Merge branch 'MDL-51213-master' of git://github.com/damyon/moodle

author David Monllao <davidm@moodle.com>

Tue, 15 Sep 2015 09:28:34 +0000 (17:28 +0800)

committer David Monllao <davidm@moodle.com>

Tue, 15 Sep 2015 09:28:34 +0000 (17:28 +0800)
author David Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:28:34 +0000 (17:28 +0800)
committer David Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:28:34 +0000 (17:28 +0800)
diff --cc lib/externallib.php
Simple merge
diff --cc lib/weblib.php
Simple merge
author	David Monllao <davidm@moodle.com>
	Tue, 15 Sep 2015 09:28:34 +0000 (17:28 +0800)
committer	David Monllao <davidm@moodle.com>
	Tue, 15 Sep 2015 09:28:34 +0000 (17:28 +0800)
		1	2
lib/externallib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/weblib.php	patch \|	diff1 \|	diff2 \|	blob \| history