Merge branch 'MDL-59741-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 00:34:11 +0000 (02:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 00:34:11 +0000 (02:34 +0200)
commiteb74752523f7a25cb11af845b24bee08ede019ad
tree33a628c24cde2d2583298782bd07466cde0cc0b1
parentf3625f47c53af075df8d104d1495a0c451f30b64
parent220656e83b2d38a4168f78ec8d9b9ebff9752ebb
Merge branch 'MDL-59741-master' of git://github.com/jleyva/moodle