Merge branch 'MDL-23813_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

filter/glossary/version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2011102800;
+$plugin->version  = 2011102801;
 $plugin->requires = 2011102700;  // Requires this Moodle version
 $plugin->component= 'filter_glossary';
 

filter/glossary/yui/autolinker/autolinker.js

@@ -132,4 +132,4 @@ YUI.add('moodle-filter_glossary-autolinker', function(Y) {
         return new AUTOLINKER(config);
     }
 
-}, '@VERSION@', {requires:['base','node','event-delegate','overlay','moodle-enrol-notification']});
+}, '@VERSION@', {requires:['base','node','io-base','json-parse','event-delegate','overlay','moodle-enrol-notification']});