Merge branch 'wip-MDL-62391-35' of git://github.com/abgreeve/moodle into MOODLE_35_STABLE
commit74c35a91337e704866064c195fe9ccdfddcd52e9
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jun 2018 01:40:16 +0000 (20 09:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jun 2018 01:40:16 +0000 (20 09:40 +0800)
tree7bcf566ca012d5f481af1e8cfc8173ea4ced2880
parentaf963ad2ae36c7a7e3a932a95eaf6e3ee4e61539
parentb4b5124c73884481344a5b014e4ead92c94e96dd
Merge branch 'wip-MDL-62391-35' of git://github.com/abgreeve/moodle into MOODLE_35_STABLE