Merge branch 'MDL-62698' of git://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 26 Jun 2018 07:26:21 +0000 (15:26 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 26 Jun 2018 07:26:21 +0000 (15:26 +0800)

Trivial merge