From: Andrew Nicols Date: Mon, 26 Mar 2018 07:35:29 +0000 (+0800) Subject: Merge branch 'MDL-55532-master' of git://github.com/lameze/moodle X-Git-Tag: v3.5.0-beta~274 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=306a0bafed1c69dfbe568ef1a79aacdb99594243 Merge branch 'MDL-55532-master' of git://github.com/lameze/moodle --- 306a0bafed1c69dfbe568ef1a79aacdb99594243