Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)
1  2 
course/lib.php
lib/adminlib.php

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