Merge branch 'MDL-61663-master-phpunit' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 17 Apr 2018 06:44:12 +0000 (14:44 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 17 Apr 2018 06:44:12 +0000 (14:44 +0800)

Trivial merge