Merge branch 'MDL-59123-master-3' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 07:24:24 +0000 (09:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 07:24:24 +0000 (09:24 +0200)
commite2aa2f25f1e4546076e273f6f19a9a18c43d435d
tree9fcfe773df7232e1b910d0de629458cdf6e2fc07
parent8d7ae061e3ea5ad828e6e8a59c6645df754d5dab
parent5dd40ec4b4bd8fb6cf36407c07596842f023e0a7
Merge branch 'MDL-59123-master-3' of git://github.com/ryanwyllie/moodle