Merge branch 'MDL-62014-master' of git://github.com/nashtechdev01/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 22:57:21 +0000 (00:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 22:57:21 +0000 (00:57 +0200)

Trivial merge