Merge branch 'MDL-59790-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Aug 2017 09:34:22 +0000 (11:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Aug 2017 09:34:22 +0000 (11:34 +0200)

Trivial merge