Merge branch 'MDL-60243-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Sep 2017 18:38:50 +0000 (20:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Sep 2017 18:38:50 +0000 (20:38 +0200)
commit591d42b073cbf7616a875bcfaf71d9848a084166
treee9d53a9d1503a08e7242cd5c511733b85a3e68e7
parent839aa86f0d2f5e744cd49c7086f2c602ab4bbd2c
parent54ec93885c30c9a73d028c21a396fee8d510c29f
Merge branch 'MDL-60243-master' of https://github.com/snake/moodle