Merge branch 'MDL-60094-master' of https://github.com/abias/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:50:37 +0000 (01:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:50:37 +0000 (01:50 +0200)

Trivial merge