Merge branch 'MDL-59086_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Jun 2017 07:44:46 +0000 (08:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Jun 2017 07:44:46 +0000 (08:44 +0100)
commitcafd4bc67ecaf71d004d2e34a54b7201b7722021
tree5dc93bb7ba73421acd4e4432e8ab4bc67585537c
parent4b64128f5bb3ef0c48dd533fb6adbe38f87ec139
parent9bd705e3dd95bf39a8ea33f311bf8078b17893d8
Merge branch 'MDL-59086_master' of git://github.com/markn86/moodle