Merge branch 'MDL-58725_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 4 May 2017 14:15:35 +0000 (15:15 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 May 2017 14:15:35 +0000 (15:15 +0100)
commit97b93cafef21545f281b134ec2b6bb17e9452cf9
tree53bed0731c0b561493c183cae5691535e29e6c15
parentad587bee83d851153db96d0ac60c1c0489f63f9f
parentdbcc8b31536b9420bf579b7013c495b457b7a4f5
Merge branch 'MDL-58725_master' of git://github.com/markn86/moodle