Merge branch 'MDL-59614-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 23:48:35 +0000 (01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 23:48:35 +0000 (01:48 +0200)

Trivial merge