Merge branch 'MDL-59005-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Jun 2017 08:51:50 +0000 (09:51 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Jun 2017 08:51:50 +0000 (09:51 +0100)
commit4431f1e0e3adc9be9f8a72aa6d9b54d6d3173420
treead329caf1616a8930fe266381247550f37e42763
parent2764bcf49bec273947d3bf733a42164b8d5e7067
parentff2dab456642284743c960778589a80f364819d3
Merge branch 'MDL-59005-master' of git://github.com/lameze/moodle