Merge branch 'MDL-52370-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 07:01:42 +0000 (15:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 07:01:42 +0000 (15:01 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge