Merge branch 'MDL-59080_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:49:03 +0000 (12:49 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:49:03 +0000 (12:49 +0100)
commit646916b9145f2a05ddb1b73e7e7c93fdb7c2dcd5
tree8f1bbddef1e29185dd91173c5a62f2a1ec52736f
parente796817c97204ffac5fab3c525d214b42d5757c7
parent7bfebce0c0377359e43ac66b2907e94c8ac00123
Merge branch 'MDL-59080_master' of git://github.com/lazydaisy/moodle