Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 3 Nov 2017 01:14:52 +0000 (09:14 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 3 Nov 2017 01:14:52 +0000 (09:14 +0800)
commit4071a2b6fe91c45cc52ecee7961ea862f709637e
tree46d2e6bb53f7444cc3ebbce6d3c8cb7bdd500aac
parentb974b5d05d5217f49087cb866c6faa605da4ea7a
parent6630b38c95619ffd8d9c9179d73b6665f1856adb
Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle