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)
commitaf80f7b4a5a59a2e8e90691cdeb91d5e846a02f8
treee748d2a7fb39e3d445dca09f09c6c5cc55d0cd56
parentb8d2340bb743811e1b55dc14cbad2ab78a8771a2
parent2a848ab9e2223b2eca5c0ead807d1c5fae6902d1
Merge branch 'MDL-45027-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