Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:40:31 +0000 (11:40 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:07 +0000 (12:04 +0000)
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