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)
commitf8a60dfe88b01d1c675a0d4858ad89928c859a70
treee240a484f5f09d2847a60b16ddae726b618976bd
parent49ca1e77b0ce395d83d4e6118f5bbb02abffbf54
parent5b9e2cc78b18327cb39dd606d2cd008a00a1dbc4
Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle

Conflicts:
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
course/yui/dragdrop/dragdrop.js
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