Merge branch 'MDL-59317' of https://github.com/NeillM/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:28:28 +0000 (13:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:28:28 +0000 (13:28 +0100)
commitbf51478fce3e5727f3a19a3848e8134c5080a259
tree65e426421a5590d9b0e5b14819fea2150e21dc3d
parentbef9a71934ef3d5debe04d6c5af699779c9f609a
parent22481f3d89cf0204aeacde6f20d5b16bb5bc03ae
Merge branch 'MDL-59317' of https://github.com/NeillM/moodle