Merge branch 'MDL-62016_master' of git://github.com/dmonllao/moodle

author Jake Dallimore <jake@moodle.com>

Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)

committer Jake Dallimore <jake@moodle.com>

Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)
author Jake Dallimore <jake@moodle.com>
Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)
committer Jake Dallimore <jake@moodle.com>
Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)
diff --cc admin/tool/dataprivacy/classes/output/data_registry_page.php
Simple merge
diff --cc admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
Simple merge
author	Jake Dallimore <jake@moodle.com>
	Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)
committer	Jake Dallimore <jake@moodle.com>
	Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)
		1	2
admin/tool/dataprivacy/classes/output/data_registry_page.php	patch \|	diff1 \|	diff2 \|	blob \| history
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php	patch \|	diff1 \|	diff2 \|	blob \| history