Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 29 Oct 2013 05:57:51 +0000 (13:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 29 Oct 2013 05:57:51 +0000 (13:57 +0800)
Conflicts:
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js

1  2 
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-debug.js
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit.js
lib/yui/src/formautosubmit/js/formautosubmit.js