Merge branch 'MDL-63827' of https://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 5 Nov 2018 02:28:11 +0000 (10:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 5 Nov 2018 02:28:11 +0000 (10:28 +0800)

Trivial merge