Merge branch 'wip-MDL-57649-master' of git://github.com/abgreeve/moodle
commit16c903acc0fc63f79c266b80a408b727ee99536b
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:01:05 +0000 (17 09:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:01:05 +0000 (17 09:01 +0100)
tree4b55c168c5e6d0b16e70d6144b17cb880d973201
parent35d27924f9e2ff21607efac4f59bd42268321d77
parent63cf03265b46f21bc3c028a86a983dded3037a67
Merge branch 'wip-MDL-57649-master' of git://github.com/abgreeve/moodle