Merge branch 'MDL-59049-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:09:09 +0000 (23:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:09:09 +0000 (23:09 +0200)

Trivial merge