Merge branch 'MDL-59396_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:33:09 +0000 (02:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:33:09 +0000 (02:33 +0200)
commit8eb4f41f1df1c71c9a37a51295e95eb96156d5a5
tree164aad9c254c9d77d0b4e7bb122f414993654ba9
parent5133e30da339bb06a53a76a32518e4953c2bc6c5
parenta24c59b9b4518b67e03aff0f35b7b5624de1c37c
Merge branch 'MDL-59396_master' of git://github.com/markn86/moodle