Merge branch 'MDL-61020-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 05:58:03 +0000 (13:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 05:58:03 +0000 (13:58 +0800)

Trivial merge