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

author David Monllao <davidm@moodle.com>

Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)

committer David Monllao <davidm@moodle.com>

Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)
author David Monllao <davidm@moodle.com>
Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)
committer David Monllao <davidm@moodle.com>
Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)
diff --cc lib/adminlib.php
Simple merge
diff --cc lib/dml/mysqli_native_moodle_database.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
author	David Monllao <davidm@moodle.com>
	Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)
committer	David Monllao <davidm@moodle.com>
	Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)
		1	2
lib/adminlib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dml/mysqli_native_moodle_database.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history