Merge branch 'MDL-64025-master' of https://github.com/christianwolters/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 18 Dec 2018 14:58:06 +0000 (15:58 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 18 Dec 2018 14:58:06 +0000 (15:58 +0100)

Trivial merge