Merge branch 'MDL-60472_master' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 31 Oct 2017 07:18:37 +0000 (15:18 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 31 Oct 2017 07:18:37 +0000 (15:18 +0800)
commit9cca2db57013c4f18e5716336cbbbd8c9ee9c976
treee1f72348e34c1eac80dc067f7cd38cc6f1ae7ba9
parent9daa5874a060de938ad8cb2f013327a6fc16011a
parent9f33d5ac6ee27a194b2ee6aa1dcbf27a3e7c70be
Merge branch 'MDL-60472_master' of git://github.com/markn86/moodle