Merge branch 'MDL-61781-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:46:08 +0000 (23:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:46:08 +0000 (23:46 +0200)

Trivial merge