Merge branch 'MDL-63282_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 8 Nov 2018 06:00:00 +0000 (14:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 8 Nov 2018 06:00:00 +0000 (14:00 +0800)

Trivial merge