Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 20 Oct 2017 03:49:54 +0000 (16:49 +1300)
committerJun Pataleta <jun@moodle.com>
Fri, 20 Oct 2017 03:49:54 +0000 (16:49 +1300)
commiteed0bc36e1ec5cbfed2e81cf0bd72ff7aac55dcd
tree7acfa40db4488c94e285ffe3438edafd290ffe7a
parent12514bd5732f983f30af13bf1f51ba3a0f61ffe4
parentfac5051624a683d1af8dd7eaf847c4134cc81635
Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle