Merge branch 'MDL-30899_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 01:11:31 +0000 (09:11 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 01:11:31 +0000 (09:11 +0800)
1  2 
course/lib.php
enrol/manual/yui/quickenrolment/quickenrolment.js

diff --cc course/lib.php
Simple merge