Merge branch 'wip-MDL-62215-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
commita20987ace8cbae0d43408078a3410caf2eb8a8fd
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 07:01:11 +0000 (26 15:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 07:01:11 +0000 (26 15:01 +0800)
tree448105c9f6d1416d5ef747c4a24328601f76b09d
parent4444333a285e02ea7608d56faf15927cd32eeab5
parent001b73720d02cfbd73159957d092b6ddf9b998ee
Merge branch 'wip-MDL-62215-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE