Merge branch 'wip-MDL-56439-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 13:33:53 +0000 (14:33 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 13:33:53 +0000 (14:33 +0100)
commit2eb61a66dc31d6f6835553c0e368619f12d83e37
treec03028134744a5d6e5cd16e85c2dfa8086b5ec1d
parent17553c635089d6a4a466fafc812321e301733232
parent5e4f1cfff041169926c69ba5400778cdbe0c1123
Merge branch 'wip-MDL-56439-master' of git://github.com/marinaglancy/moodle
course/format/lib.php