Merge branch 'MDL-49651-master' of git://github.com/Chocolate-lightning/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 3 Jan 2019 02:45:07 +0000 (10:45 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 3 Jan 2019 02:45:07 +0000 (10:45 +0800)

Trivial merge