Merge branch 'MDL-13745-master-nosetting' of git://github.com/vmdef/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 12 Mar 2019 09:05:31 +0000 (17:05 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 12 Mar 2019 09:05:31 +0000 (17:05 +0800)

Trivial merge