Merge branch 'MDL-60991' of https://github.com/mkassaei/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 7 Mar 2018 01:29:54 +0000 (09:29 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 7 Mar 2018 01:29:54 +0000 (09:29 +0800)

Trivial merge