Merge branch 'MDL-58472-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Jun 2017 08:38:29 +0000 (09:38 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Jun 2017 08:38:29 +0000 (09:38 +0100)
commit2764bcf49bec273947d3bf733a42164b8d5e7067
treeaad7fe2eef59890ad495b5303de6ced71c3c188c
parent88720416ba9324106f8c185cbaae19c1f486daeb
parent4a0a23e98fa9af3ed6f12480131a9a6b34ebbebf
Merge branch 'MDL-58472-master' of git://github.com/damyon/moodle