Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Feb 2014 01:10:52 +0000 (14:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Feb 2014 01:10:52 +0000 (14:10 +1300)
Conflicts:
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js

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