Merge branch 'MDL-64678-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 5 Mar 2019 05:51:33 +0000 (13:51 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 5 Mar 2019 05:51:33 +0000 (13:51 +0800)

Trivial merge