Merge branch 'MDL-49399-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 17 Jan 2019 00:22:37 +0000 (08:22 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 17 Jan 2019 00:22:37 +0000 (08:22 +0800)

Trivial merge