Merge branch 'MDL-61162-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:57:12 +0000 (22:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:57:12 +0000 (22:57 +0100)

Trivial merge