Merge branch 'wip-MDL-57649-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE
commit5db085f0a74149cc0a00d77cf8720df2124d89e2
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:01:12 +0000 (17 09:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:01:12 +0000 (17 09:01 +0100)
tree835d7bd6ce2e23b9fd29b872714fac7647954b2e
parentab4afd711a526215805e526d6b0a7c9bf5b40958
parent734fb0f01547e590ebe270bd47334f71d4c9267d
Merge branch 'wip-MDL-57649-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE