Merge branch 'MDL-46783' of https://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 6 Dec 2018 02:22:57 +0000 (10:22 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 6 Dec 2018 02:22:57 +0000 (10:22 +0800)

Trivial merge