Merge branch 'MDL-61402' of https://github.com/mkassaei/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 20 Feb 2018 02:36:41 +0000 (10:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:53 +0000 (08:30 +0800)

Trivial merge