Merge branch 'MDL-59661_master-unit-test' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 11:23:11 +0000 (13:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 11:23:11 +0000 (13:23 +0200)

Trivial merge