Merge branch 'wip-MDL-57649-master-fix' of git://github.com/abgreeve/moodle
commit0224022b080671f0d1f5e5e33da794201e849f5b
authorDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 08:33:07 +0000 (19 09:33 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 08:33:07 +0000 (19 09:33 +0100)
treeb711662e7dfd5926a591083a8765a95601c0156f
parent088494fd0492e81a5840a779f590cfae0be0c12d
parent23e2a9cb7c3b8e475522cf355bad442300f5a693
Merge branch 'wip-MDL-57649-master-fix' of git://github.com/abgreeve/moodle