Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle

author Damyon Wiese <damyon@moodle.com>

Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)

committer Damyon Wiese <damyon@moodle.com>

Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)
author Damyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)
committer Damyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)
diff --cc group/lib.php
Simple merge
diff --cc mod/glossary/lib.php
Simple merge
author	Damyon Wiese <damyon@moodle.com>
	Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)
committer	Damyon Wiese <damyon@moodle.com>
	Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)
		1	2
group/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/glossary/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history