Merge branch 'MDL-48012_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 01:41:09 +0000 (09:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 01:41:09 +0000 (09:41 +0800)
1  2 
course/lib.php
lib/moodlelib.php

diff --cc course/lib.php
Simple merge
Simple merge