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)
commitb73fd8608a000679754318fa4908ee1a896be9df
tree0b8834f9740eb6f586112d3d2608f059e50fb4ba
parent16b2fc591379080e14b836779cb7c1d99fa6ba3d
parent26df91ca5718bc6e7cb586037a25a5b0b5ded05f
Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle

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