Merge branch 'MDL-45027-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:23:45 +0000 (10:23 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:23:45 +0000 (10:23 +0800)
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