Merge branch 'MDL-61248' of https://github.com/ak4t0sh/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Mar 2018 22:26:34 +0000 (00:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:52 +0000 (18:12 +0200)

Trivial merge