From: Andrew Nicols Date: Mon, 24 Jul 2017 07:03:30 +0000 (+0800) Subject: Merge branch 'wip-MDL-38129-master' of git://github.com/marinaglancy/moodle X-Git-Tag: v3.4.0-beta~589 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=680732844c3cd131bd11512e9323a63936e4b76c Merge branch 'wip-MDL-38129-master' of git://github.com/marinaglancy/moodle --- 680732844c3cd131bd11512e9323a63936e4b76c