Merge branch 'MDL-59401-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 10:59:25 +0000 (12:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 10:59:25 +0000 (12:59 +0200)
commit4bc267c3f47ec72693d63bcb005eeb17ffea50ee
tree4e94da871a657e1ea85f7eaa60bcabfbe45a74bf
parentd2800e59288a164695c4fe23bb279f57355d569a
parentaac70425e47b03b0a7f957defc91a92f988e502e
Merge branch 'MDL-59401-master' of git://github.com/jleyva/moodle