Merge branch 'MDL-55415-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Sep 2016 09:49:39 +0000 (10:49 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Sep 2016 09:49:39 +0000 (10:49 +0100)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge