Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 05:06:54 +0000 (13:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 05:06:54 +0000 (13:06 +0800)
Conflicts:
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
course/yui/dragdrop/dragdrop.js

1  2 
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-debug.js
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
course/yui/build/moodle-course-modchooser/moodle-course-modchooser.js
course/yui/src/modchooser/js/modchooser.js