Merge branch 'wip-MDL-57649-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
commit3841028a987c3bf693c379bcf0b9b86787c79a67
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:01:33 +0000 (17 09:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:01:33 +0000 (17 09:01 +0100)
tree64bb75f3cbfb743281ecf9c74d864816b0f31069
parent3b61a615bb80bd4fc23cdfd3d80ffa811a3efb80
parent93dbfb431c2427c0fd4a7c7c423544f6a4bba8d5
Merge branch 'wip-MDL-57649-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE