Merge branch 'wip-MDL-60033-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 16 Oct 2017 07:36:29 +0000 (15:36 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 16 Oct 2017 07:36:29 +0000 (15:36 +0800)

Trivial merge