Merge branch 'MDL-57587' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Feb 2017 10:59:26 +0000 (10:59 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Feb 2017 10:59:26 +0000 (10:59 +0000)
commit586543f2dc25a577d7d27b8a5f710ccf6328b511
tree944c8a9970b929ad4a9c25124d328e42ea6d7e1b
parent695f2b09ce72d66f6b9170d89c35250c6d3569f0
parentc28bfbef24cf61fc8710e89ed0e0944707191f6c
Merge branch 'MDL-57587' of git://github.com/timhunt/moodle