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)
commit3d891e3263d406eae858cdad89c577e1e42b47d0
treed73d8917a038b54043b24eb858784fc97185ee72
parent7594ed1e2a729270a85bdb1499bd87df6fbc499d
parenta4c318325ca166f3a7af0c9adae25e46a4681400
Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle

Conflicts:
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
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