Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 07:35:05 +0000 (15:35 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 07:35:05 +0000 (15:35 +0800)
1  2 
course/lib.php
course/yui/modchooser/modchooser.js

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