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)
commit56418292f14a821bd042a22734da594448f43e2a
treeb0c67b14e7ad411ca92e3c731568cd1642d238a3
parentb69e9d87242049656368d9689acb7e12c75479cc
parent1282c474460e8a7ee5bea7182b59645f535baed1
Merge branch 'MDL-45138-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