Merge branch 'MDL-60198-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 18:15:42 +0000 (20:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 18:15:42 +0000 (20:15 +0200)
commitfe61786879712e2264b0bcbc1e6a0a7a1a1e7cfd
treee5e42159c53e798dc2d5a168f6236b0bfa2b2feb
parent012c2b84b577cc6d3d57f94aadfa9540cedbbed8
parente71687baf99709a6e87d18f506c2d195dd782396
Merge branch 'MDL-60198-master' of git://github.com/jleyva/moodle