Merge branch 'MDL-59364_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:31:48 +0000 (02:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:31:48 +0000 (02:31 +0200)
commit5133e30da339bb06a53a76a32518e4953c2bc6c5
tree751dc9236fc9bdbe5b055fe1df85d175605c9724
parentacbcffd34253001c03b8f2de4edcfbec92d98a6c
parent4c7593ff5b66cbe31ac04edaa68e146752489e17
Merge branch 'MDL-59364_master' of git://github.com/markn86/moodle