Merge branch 'MDL-45138-master' of https://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 20:29:38 +0000 (08:29 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 20:29:38 +0000 (08:29 +1200)
Conflicts:
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js

1  2 
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js
availability/yui/src/form/js/form.js