Merge branch 'wip-mdl-36736-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 04:09:46 +0000 (12:09 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 04:09:46 +0000 (12:09 +0800)
1  2 
course/lib.php
course/yui/toolboxes/toolboxes.js

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