Damyon Wiese f8a60dfe88 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
2014-01-14 13:06:54 +08:00
..