Merge branch 'MDL-64200-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Feb 2019 14:57:55 +0000 (15:57 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Feb 2019 14:57:55 +0000 (15:57 +0100)

Trivial merge