Merge branch 'wip-MDL-58729-master' of git://github.com/abgreeve/moodle
commit6f2950cf59d3cbe1ff29a7793b2062cefecf85b3
authorJake Dallimore <jake@moodle.com>
Tue, 20 Jun 2017 07:18:16 +0000 (20 15:18 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 20 Jun 2017 07:18:16 +0000 (20 15:18 +0800)
tree646c121c0f841dd5bd0ddcce61440122662b409f
parentb70b7df6d39511d15633b1c268e364b28d340970
parentc05dc071b0a1bbd0c98bcbfe8c507d21443bc6d8
Merge branch 'wip-MDL-58729-master' of git://github.com/abgreeve/moodle