Merge branch 'MDL-56433-master' of git://github.com/damyon/moodle
commit25b0727e5018ec0a0d371b2e60b58332617af3a3
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 09:33:28 +0000 (2 09:33 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 09:33:28 +0000 (2 09:33 +0000)
tree19f2d430b98c60d8d756e20e5269cf31883d12d8
parentb4b8d4fcc2c2d8a9835265245c8edca5508cdd37
parent9629c86f6c455d64c79a39a6d3397eaf4b3fb508
Merge branch 'MDL-56433-master' of git://github.com/damyon/moodle