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)
1  2 
course/format/lib.php

Simple merge