Merge branch 'MDL-37430-23' of github.com:damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 03:53:57 +0000 (11:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 03:53:57 +0000 (11:53 +0800)
1  2 
course/lib.php
course/yui/toolboxes/toolboxes.js

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