Merge branch 'MDL-62849-master' of git://github.com/abgreeve/moodle
commit4a91bd6f62e61c913122c160a03113737efd42ff
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 02:31:29 +0000 (17 10:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 02:31:29 +0000 (17 10:31 +0800)
treeecdce166763fc4e255e3dd19f89982fe1eea9a63
parentc6f64c217dada673488880a44aee56839fba0944
parentf38766e16670717b39cc000cff5f6c408f7080f9
Merge branch 'MDL-62849-master' of git://github.com/abgreeve/moodle