Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 11:45:55 +0000 (12:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 11:45:55 +0000 (12:45 +0100)
commit0cf471fbdde41f5e343de1e1eae408e5a0c197fd
tree33fc8fffa83c87e1a272c7ad6a821d76b7b33d2c
parent2e6f52212fef3997ee05c8be8556163ab6875de6
parent4d9036d6eb5857575fe26a3997818b4cc44ab71a
Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle