Merge branch 'MDL-29279' of git://github.com/mouneyrac/moodle

Merge branch 'MDL-29126_export_separator' of git://github.com/andyjdavis/moodle

MDL-29029 admin_tool - fixed 2 ocurrences pointing to old paths

Merge branch 'w37_MDL-29029_m22_admintools' of git://github.com/skodak/moodle

Merge branch 'w37_MDL-29081_m22_googlespellproxy' of git://github.com/skodak/moodle

Merge branch 'wip-MDL-29185-master' of git://github.com/samhemelryk/moodle

Merge branch 's13_MDL-29036_ws_upload_master' of git://github.com/dongsheng/moodle

MDL-29036 WEBSERVICE : webservice upload script should respect maxbytes and userquota settings

Merge branch 'MDL-29366' of git://github.com/timhunt/moodle

Merge branch 'MDL-28329' of git://github.com/timhunt/moodle

MDL-29279 REST server can return json format

Merge branch 'wip-mdl-25937' of git://github.com/rajeshtaneja/moodle

Merge branch 's13_MDL-28509_youtube_master' of github.com:dongsheng/moodle

MDL-28509 repository : fixed youtube repository search keyword

MDL-28509 repository_youtube Enable selection of sort order

Merge branch 'MDL-29276' of git://github.com/mouneyrac/moodle

Merge branch 'w37_MDL-29406_m22_configdelete' of git://github.com/skodak/moodle

Merge branch 'MDL-29360' of git://github.com/timhunt/moodle

Merge branch 'MDL-28259' of git://github.com/timhunt/moodle

MDL-29321 syntax - fix switch() statement

MDL-29314 syntax - fix switch() statement

Merge branch 'MDL-29415' of git://github.com/stronk7/moodle

MDL-29415 xmldb - fix get_columns() in oracle to get char based lengths + test

MDL-29081 add proxy support to googlespell

MDL-29029 move user upload to admin tools

AMOS BEGIN
 MOV [uploadpictures,core_admin],[uploadpictures,tool_uploaduser]
 MOV [uploadpictures_help,core_admin],[uploadpictures_help,tool_uploaduser]
 MOV [uploadusers,core_admin],[uploadusers,tool_uploaduser]
 MOV [uploadusers_help,core_admin],[uploadusers_help,tool_uploaduser]
 MOV [uploaduserspreview,core_admin],[uploaduserspreview,tool_uploaduser]
 MOV [uploadusersresult,core_admin],[uploadusersresult,tool_uploaduser]
 MOV [uucsvline,core_admin],[uucsvline,tool_uploaduser]
 MOV [userrenamed,core_admin],[userrenamed,tool_uploaduser]
 MOV [useraccountupdated,core_admin],[useraccountupdated,tool_uploaduser]
 MOV [useraccountuptodate,core_admin],[useraccountuptodate,tool_uploaduser]
 MOV [userdeleted,core_admin],[userdeleted,tool_uploaduser]
 MOV [uupasswordcron,core_admin],[uupasswordcron,tool_uploaduser]
 MOV [userscreated,core_admin],[userscreated,tool_uploaduser]
 MOV [usersupdated,core_admin],[usersupdated,tool_uploaduser]
 MOV [usersdeleted,core_admin],[usersdeleted,tool_uploaduser]
 MOV [deleteerrors,core_admin],[deleteerrors,tool_uploaduser]
 MOV [usersrenamed,core_admin],[usersrenamed,tool_uploaduser]
 MOV [renameerrors,core_admin],[renameerrors,tool_uploaduser]
 MOV [usersskipped,core_admin],[usersskipped,tool_uploaduser]
 MOV [usersweakpassword,core_admin],[usersweakpassword,tool_uploaduser]
 MOV [errors,core_admin],[errors,tool_uploaduser]
 MOV [csvdelimiter,core_admin],[csvdelimiter,tool_uploaduser]
 MOV [encoding,core_admin],[encoding,tool_uploaduser]
 MOV [rowpreviewnum,core_admin],[rowpreviewnum,tool_uploaduser]
 MOV [uuoptype_addinc,core_admin],[uuoptype_addinc,tool_uploaduser]
 MOV [uuoptype_addnew,core_admin],[uuoptype_addnew,tool_uploaduser]
 MOV [uuoptype_addupdate,core_admin],[uuoptype_addupdate,tool_uploaduser]
 MOV [uuoptype_update,core_admin],[uuoptype_update,tool_uploaduser]
 MOV [uuoptype,core_admin],[uuoptype,tool_uploaduser]
 MOV [uupasswordnew,core_admin],[uupasswordnew,tool_uploaduser]
 MOV [uupasswordold,core_admin],[uupasswordold,tool_uploaduser]
 MOV [nochanges,core_admin],[nochanges,tool_uploaduser]
 MOV [uuupdateall,core_admin],[uuupdateall,tool_uploaduser]
 MOV [uuupdatefromfile,core_admin],[uuupdatefromfile,tool_uploaduser]
 MOV [uuupdatemissing,core_admin],[uuupdatemissing,tool_uploaduser]
 MOV [uuupdatetype,core_admin],[uuupdatetype,tool_uploaduser]
 MOV [allowrenames,core_admin],[allowrenames,tool_uploaduser]
 MOV [allowdeletes,core_admin],[allowdeletes,tool_uploaduser]
 MOV [uunoemailduplicates,core_admin],[uunoemailduplicates,tool_uploaduser]
 MOV [uustandardusernames,core_admin],[uustandardusernames,tool_uploaduser]
 MOV [uubulk,core_admin],[uubulk,tool_uploaduser]
 MOV [uubulkall,core_admin],[uubulkall,tool_uploaduser]
 MOV [uubulknew,core_admin],[uubulknew,tool_uploaduser]
 MOV [uubulkupdated,core_admin],[uubulkupdated,tool_uploaduser]
 MOV [uulegacy1role,core_admin],[uulegacy1role,tool_uploaduser]
 MOV [uulegacy2role,core_admin],[uulegacy2role,tool_uploaduser]
 MOV [uulegacy3role,core_admin],[uulegacy3role,tool_uploaduser]
 MOV [defaultvalues,core_admin],[defaultvalues,tool_uploaduser]
 MOV [uuusernametemplate,core_admin],[uuusernametemplate,tool_uploaduser]
 MOV [requiredtemplate,core_admin],[requiredtemplate,tool_uploaduser]
 MOV [uploadpicture_baduserfield,core_admin],[uploadpicture_baduserfield,tool_uploaduser]
 MOV [uploadpicture_cannotmovezip,core_admin],[uploadpicture_cannotmovezip,tool_uploaduser]
 MOV [uploadpicture_cannotprocessdir,core_admin],[uploadpicture_cannotprocessdir,tool_uploaduser]
 MOV [uploadpicture_cannotsave,core_admin],[uploadpicture_cannotsave,tool_uploaduser]
 MOV [uploadpicture_cannotunzip,core_admin],[uploadpicture_cannotunzip,tool_uploaduser]
 MOV [uploadpicture_invalidfilename,core_admin],[uploadpicture_invalidfilename,tool_uploaduser]
 MOV [uploadpicture_overwrite,core_admin],[uploadpicture_overwrite,tool_uploaduser]
 MOV [uploadpicture_userfield,core_admin],[uploadpicture_userfield,tool_uploaduser]
 MOV [uploadpicture_usernotfound,core_admin],[uploadpicture_usernotfound,tool_uploaduser]
 MOV [uploadpicture_userskipped,core_admin],[uploadpicture_userskipped,tool_uploaduser]
 MOV [uploadpicture_userupdated,core_admin],[uploadpicture_userupdated,tool_uploaduser]
AMOS END

MDL-29029 move multilang upgrade to admin tools

AMOS BEGIN
 MOV [multilangupgrade,core_admin],[pluginname,tool_ multilangupgrade]
 MOV [multilangupgradeinfo,core_admin],[multilangupgradeinfo,tool_ multilangupgrade]
AMOS END

MDL-29029 move xmldb-editor to admin tools

AMOS BEGIN
 MOV [xmldbeditor,moodle],[pluginname,tool_xmldb]
 MOV [actual,core_xmldb],[actual,tool_xmldb]
 MOV [aftertable,core_xmldb],[aftertable,tool_xmldb]
 MOV [back,core_xmldb],[back,tool_xmldb]
 MOV [backtomainview,core_xmldb],[backtomainview,tool_xmldb]
 MOV [binaryincorrectlength,core_xmldb],[binaryincorrectlength,tool_xmldb]
 MOV [cannotuseidfield,core_xmldb],[cannotuseidfield,tool_xmldb]
 MOV [completelogbelow,core_xmldb],[completelogbelow,tool_xmldb]
 MOV [confirmdeletefield,core_xmldb],[confirmdeletefield,tool_xmldb]
 MOV [confirmdeleteindex,core_xmldb],[confirmdeleteindex,tool_xmldb]
 MOV [confirmdeletekey,core_xmldb],[confirmdeletekey,tool_xmldb]
 MOV [confirmdeletetable,core_xmldb],[confirmdeletetable,tool_xmldb]
 MOV [confirmdeletexmlfile,core_xmldb],[confirmdeletexmlfile,tool_xmldb]
 MOV [confirmcheckbigints,core_xmldb],[confirmcheckbigints,tool_xmldb]
 MOV [confirmcheckdefaults,core_xmldb],[confirmcheckdefaults,tool_xmldb]
 MOV [confirmcheckforeignkeys,core_xmldb],[confirmcheckforeignkeys,tool_xmldb]
 MOV [confirmcheckindexes,core_xmldb],[confirmcheckindexes,tool_xmldb]
 MOV [confirmrevertchanges,core_xmldb],[confirmrevertchanges,tool_xmldb]
 MOV [create,core_xmldb],[create,tool_xmldb]
 MOV [createtable,core_xmldb],[createtable,tool_xmldb]
 MOV [defaultincorrect,core_xmldb],[defaultincorrect,tool_xmldb]
 MOV [delete,core_xmldb],[delete,tool_xmldb]
 MOV [delete_field,core_xmldb],[delete_field,tool_xmldb]
 MOV [delete_index,core_xmldb],[delete_index,tool_xmldb]
 MOV [delete_key,core_xmldb],[delete_key,tool_xmldb]
 MOV [delete_table,core_xmldb],[delete_table,tool_xmldb]
 MOV [delete_xml_file,core_xmldb],[delete_xml_file,tool_xmldb]
 MOV [doc,core_xmldb],[doc,tool_xmldb]
 MOV [docindex,core_xmldb],[docindex,tool_xmldb]
 MOV [documentationintro,core_xmldb],[documentationintro,tool_xmldb]
 MOV [down,core_xmldb],[down,tool_xmldb]
 MOV [duplicate,core_xmldb],[duplicate,tool_xmldb]
 MOV [duplicatefieldname,core_xmldb],[duplicatefieldname,tool_xmldb]
 MOV [duplicatekeyname,core_xmldb],[duplicatekeyname,tool_xmldb]
 MOV [edit,core_xmldb],[edit,tool_xmldb]
 MOV [edit_field,core_xmldb],[edit_field,tool_xmldb]
 MOV [edit_field_save,core_xmldb],[edit_field_save,tool_xmldb]
 MOV [edit_index,core_xmldb],[edit_index,tool_xmldb]
 MOV [edit_index_save,core_xmldb],[edit_index_save,tool_xmldb]
 MOV [edit_key,core_xmldb],[edit_key,tool_xmldb]
 MOV [edit_key_save,core_xmldb],[edit_key_save,tool_xmldb]
 MOV [edit_table,core_xmldb],[edit_table,tool_xmldb]
 MOV [edit_table_save,core_xmldb],[edit_table_save,tool_xmldb]
 MOV [edit_xml_file,core_xmldb],[edit_xml_file,tool_xmldb]
 MOV [enumvaluesincorrect,core_xmldb],[enumvaluesincorrect,tool_xmldb]
 MOV [expected,core_xmldb],[expected,tool_xmldb]
 MOV [extensionrequired,core_xmldb],[extensionrequired,tool_xmldb]
 MOV [field,core_xmldb],[field,tool_xmldb]
 MOV [fieldnameempty,core_xmldb],[fieldnameempty,tool_xmldb]
 MOV [fields,core_xmldb],[fields,tool_xmldb]
 MOV [fieldsnotintable,core_xmldb],[fieldsnotintable,tool_xmldb]
 MOV [fieldsusedinkey,core_xmldb],[fieldsusedinkey,tool_xmldb]
 MOV [filenotwriteable,core_xmldb],[filenotwriteable,tool_xmldb]
 MOV [fkviolationdetails,core_xmldb],[fkviolationdetails,tool_xmldb]
 MOV [floatincorrectdecimals,core_xmldb],[floatincorrectdecimals,tool_xmldb]
 MOV [floatincorrectlength,core_xmldb],[floatincorrectlength,tool_xmldb]
 MOV [float2numbernote,core_xmldb],[float2numbernote,tool_xmldb]
 MOV [generate_all_documentation,core_xmldb],[generate_all_documentation,tool_xmldb]
 MOV [generate_documentation,core_xmldb],[generate_documentation,tool_xmldb]
 MOV [gotolastused,core_xmldb],[gotolastused,tool_xmldb]
 MOV [change,core_xmldb],[change,tool_xmldb]
 MOV [charincorrectlength,core_xmldb],[charincorrectlength,tool_xmldb]
 MOV [checkbigints,core_xmldb],[checkbigints,tool_xmldb]
 MOV [check_bigints,core_xmldb],[check_bigints,tool_xmldb]
 MOV [checkdefaults,core_xmldb],[checkdefaults,tool_xmldb]
 MOV [check_defaults,core_xmldb],[check_defaults,tool_xmldb]
 MOV [checkforeignkeys,core_xmldb],[checkforeignkeys,tool_xmldb]
 MOV [check_foreign_keys,core_xmldb],[check_foreign_keys,tool_xmldb]
 MOV [checkindexes,core_xmldb],[checkindexes,tool_xmldb]
 MOV [check_indexes,core_xmldb],[check_indexes,tool_xmldb]
 MOV [incorrectfieldname,core_xmldb],[incorrectfieldname,tool_xmldb]
 MOV [index,core_xmldb],[index,tool_xmldb]
 MOV [indexes,core_xmldb],[indexes,tool_xmldb]
 MOV [integerincorrectlength,core_xmldb],[integerincorrectlength,tool_xmldb]
 MOV [key,core_xmldb],[key,tool_xmldb]
 MOV [keys,core_xmldb],[keys,tool_xmldb]
 MOV [listreservedwords,core_xmldb],[listreservedwords,tool_xmldb]
 MOV [load,core_xmldb],[load,tool_xmldb]
 MOV [main_view,core_xmldb],[main_view,tool_xmldb]
 MOV [masterprimaryuniqueordernomatch,core_xmldb],[masterprimaryuniqueordernomatch,tool_xmldb]
 MOV [missing,core_xmldb],[missing,tool_xmldb]
 MOV [missingindexes,core_xmldb],[missingindexes,tool_xmldb]
 MOV [mustselectonefield,core_xmldb],[mustselectonefield,tool_xmldb]
 MOV [mustselectoneindex,core_xmldb],[mustselectoneindex,tool_xmldb]
 MOV [mustselectonekey,core_xmldb],[mustselectonekey,tool_xmldb]
 MOV [mysqlextracheckbigints,core_xmldb],[mysqlextracheckbigints,tool_xmldb]
 MOV [newfield,core_xmldb],[newfield,tool_xmldb]
 MOV [newindex,core_xmldb],[newindex,tool_xmldb]
 MOV [newkey,core_xmldb],[newkey,tool_xmldb]
 MOV [newtable,core_xmldb],[newtable,tool_xmldb]
 MOV [newtablefrommysql,core_xmldb],[newtablefrommysql,tool_xmldb]
 MOV [new_table_from_mysql,core_xmldb],[new_table_from_mysql,tool_xmldb]
 MOV [nomasterprimaryuniquefound,core_xmldb],[nomasterprimaryuniquefound,tool_xmldb]
 MOV [nomissingindexesfound,core_xmldb],[nomissingindexesfound,tool_xmldb]
 MOV [noviolatedforeignkeysfound,core_xmldb],[noviolatedforeignkeysfound,tool_xmldb]
 MOV [nowrongdefaultsfound,core_xmldb],[nowrongdefaultsfound,tool_xmldb]
 MOV [nowrongintsfound,core_xmldb],[nowrongintsfound,tool_xmldb]
 MOV [numberincorrectdecimals,core_xmldb],[numberincorrectdecimals,tool_xmldb]
 MOV [numberincorrectlength,core_xmldb],[numberincorrectlength,tool_xmldb]
 MOV [pendingchanges,core_xmldb],[pendingchanges,tool_xmldb]
 MOV [pendingchangescannotbesaved,core_xmldb],[pendingchangescannotbesaved,tool_xmldb]
 MOV [pendingchangescannotbesavedreload,core_xmldb],[pendingchangescannotbesavedreload,tool_xmldb]
 MOV [reserved,core_xmldb],[reserved,tool_xmldb]
 MOV [reservedwords,core_xmldb],[reservedwords,tool_xmldb]
 MOV [revert,core_xmldb],[revert,tool_xmldb]
 MOV [revert_changes,core_xmldb],[revert_changes,tool_xmldb]
 MOV [save,core_xmldb],[save,tool_xmldb]
 MOV [searchresults,core_xmldb],[searchresults,tool_xmldb]
 MOV [selectaction,core_xmldb],[selectaction,tool_xmldb]
 MOV [selectdb,core_xmldb],[selectdb,tool_xmldb]
 MOV [selectfieldkeyindex,core_xmldb],[selectfieldkeyindex,tool_xmldb]
 MOV [selectonecommand,core_xmldb],[selectonecommand,tool_xmldb]
 MOV [selectonefieldkeyindex,core_xmldb],[selectonefieldkeyindex,tool_xmldb]
 MOV [selecttable,core_xmldb],[selecttable,tool_xmldb]
 MOV [table,core_xmldb],[table,tool_xmldb]
 MOV [tables,core_xmldb],[tables,tool_xmldb]
 MOV [textincorrectlength,core_xmldb],[textincorrectlength,tool_xmldb]
 MOV [unload,core_xmldb],[unload,tool_xmldb]
 MOV [up,core_xmldb],[up,tool_xmldb]
 MOV [view,core_xmldb],[view,tool_xmldb]
 MOV [viewedited,core_xmldb],[viewedited,tool_xmldb]
 MOV [vieworiginal,core_xmldb],[vieworiginal,tool_xmldb]
 MOV [viewphpcode,core_xmldb],[viewphpcode,tool_xmldb]
 MOV [view_reserved_words,core_xmldb],[view_reserved_words,tool_xmldb]
 MOV [viewsqlcode,core_xmldb],[viewsqlcode,tool_xmldb]
 MOV [view_structure_php,core_xmldb],[view_structure_php,tool_xmldb]
 MOV [view_structure_sql,core_xmldb],[view_structure_sql,tool_xmldb]
 MOV [view_table_php,core_xmldb],[view_table_php,tool_xmldb]
 MOV [view_table_sql,core_xmldb],[view_table_sql,tool_xmldb]
 MOV [viewxml,core_xmldb],[viewxml,tool_xmldb]
 MOV [violatedforeignkeys,core_xmldb],[violatedforeignkeys,tool_xmldb]
 MOV [violatedforeignkeysfound,core_xmldb],[violatedforeignkeysfound,tool_xmldb]
 MOV [violations,core_xmldb],[violations,tool_xmldb]
 MOV [wrong,core_xmldb],[wrong,tool_xmldb]
 MOV [wrongdefaults,core_xmldb],[wrongdefaults,tool_xmldb]
 MOV [wrongints,core_xmldb],[wrongints,tool_xmldb]
 MOV [wronglengthforenum,core_xmldb],[wronglengthforenum,tool_xmldb]
 MOV [wrongreservedwords,core_xmldb],[wrongreservedwords,tool_xmldb]
 MOV [yesmissingindexesfound,core_xmldb],[yesmissingindexesfound,tool_xmldb]
 MOV [yeswrongdefaultsfound,core_xmldb],[yeswrongdefaultsfound,tool_xmldb]
 MOV [yeswrongintsfound,core_xmldb],[yeswrongintsfound,tool_xmldb]
AMOS END

MDL-29029 move dbtransfer to admin tools

AMOS BEGIN
 CPY [dbexport,core_dbtransfer],[pluginname,tool_dbtransfer]
 MOV [dbexport,core_dbtransfer],[dbexport,tool_dbtransfer]
 MOV [dbtransfer,core_dbtransfer],[dbtransfer,tool_dbtransfer]
 MOV [exportdata,core_dbtransfer],[exportdata,tool_dbtransfer]
 MOV [notargetconectexception,core_dbtransfer],[notargetconectexception,tool_dbtransfer]
 MOV [pluginname,core_dbtransfer],[pluginname,tool_dbtransfer]
 MOV [transferdata,core_dbtransfer],[transferdata,tool_dbtransfer]
 MOV [transferdbintro,core_dbtransfer],[transferdbintro,tool_dbtransfer]
 MOV [transferdbtoserver,core_dbtransfer],[transferdbtoserver,tool_dbtransfer]
 MOV [transferringdbto,core_dbtransfer],[transferringdbto,tool_dbtransfer]
AMOS END

MDL-29029 move innodb conversion to admin tools

MDL-29029 move lang pack import to admin tools

Includes lang related language pack cleanup.

AMOS BEGIN
 MOV [langpacks,core_admin],[pluginname,tool_langimport]
 MOV [install,core_admin],[install,tool_langimport]
 MOV [installedlangs,core_admin],[installedlangs,tool_langimport]
 MOV [langimport,core_admin],[langimport,tool_langimport]
 MOV [langimportdisabled,core_admin],[langimportdisabled,tool_langimport]
 MOV [langpackinstalled,core_admin],[langpackinstalled,tool_langimport]
 MOV [langpackremoved,core_admin],[langpackremoved,tool_langimport]
 MOV [langpackupdateskipped,core_admin],[langpackupdateskipped,tool_langimport]
 MOV [langpackuptodate,core_admin],[langpackuptodate,tool_langimport]
 MOV [langupdatecomplete,core_admin],[langupdatecomplete,tool_langimport]
 MOV [missinglangparent,core_admin],[missinglangparent,tool_langimport]
 MOV [nolangupdateneeded,core_admin],[nolangupdateneeded,tool_langimport]
 MOV [remotelangnotavailable,core_admin],[remotelangnotavailable,tool_langimport]
 MOV [uninstall,core_admin],[uninstall,tool_langimport]
 MOV [uninstallconfirm,core_admin],[uninstallconfirm,tool_langimport]
 MOV [updatelangs,core_admin],[updatelangs,tool_langimport]
AMOS END

MDL-29029 move health center to admin tools

AMOS BEGIN
 MOV [healthcenter,moodle],[pluginname,tool_health]
 MOV [healthnoproblemsfound,moodle],[healthnoproblemsfound,tool_health]
 MOV [healthproblemsdetected,moodle],[healthproblemsdetected,tool_health]
 MOV [healthproblemsolution,moodle],[healthproblemsolution,tool_health]
 MOV [healthreturntomain,moodle],[healthreturntomain,tool_health]
 MOV [healthsolution,moodle],[healthsolution,tool_health]
AMOS END

MDL-29029 move blog upgrade to admin tools

AMOS BEGIN
 MOV [bloglevelupgrade,core_admin],[pluginname,tool_bloglevelupgrade]
 MOV [bloglevelupgradedescription,core_admin],[bloglevelupgradedescription,tool_bloglevelupgrade]
 MOV [bloglevelupgradeinfo,core_admin],[bloglevelupgradeinfo,tool_bloglevelupgrade]
 MOV [bloglevelupgradeprogress,core_admin],[bloglevelupgradeprogress,tool_bloglevelupgrade]
AMOS END

MDL-29029 move unmaintained generator to admin tools

Do NOT add link into settings tree, this is extremely dangerous and buggy. It is now usable only in DEBUG_DEVELOPER mode!

MDL-29029 move all the simpletest bits into new tool unittest

AMOS BEGIN
 MOV [pluginname,report_unittest],[pluginname,tool_unittest]
 MOV [unittest:view,report_unittest],[unittest:execute,tool_unittest]
 MOV [dbtest,core_admin],[dbtest,tool_unittest]
 MOV [addconfigprefix,core_simpletest],[addconfigprefix,tool_unittest]
 MOV [all,core_simpletest],[all,tool_unittest]
 MOV [codecoverageanalysis,core_simpletest],[codecoverageanalysis,tool_unittest]
 MOV [codecoveragecompletereport,core_simpletest],[codecoveragecompletereport,tool_unittest]
 MOV [codecoveragedisabled,core_simpletest],[codecoveragedisabled,tool_unittest]
 MOV [codecoveragelatestdetails,core_simpletest],[codecoveragelatestdetails,tool_unittest]
 MOV [codecoveragelatestreport,core_simpletest],[codecoveragelatestreport,tool_unittest]
 MOV [confignonwritable,core_simpletest],[confignonwritable,tool_unittest]
 MOV [coveredlines,core_simpletest],[coveredlines,tool_unittest]
 MOV [coveredpercentage,core_simpletest],[coveredpercentage,tool_unittest]
 MOV [deletingnoninsertedrecord,core_simpletest],[deletingnoninsertedrecord,tool_unittest]
 MOV [deletingnoninsertedrecords,core_simpletest],[deletingnoninsertedrecords,tool_unittest]
 MOV [droptesttables,core_simpletest],[droptesttables,tool_unittest]
 MOV [exception,core_simpletest],[exception,tool_unittest]
 MOV [executablelines,core_simpletest],[executablelines,tool_unittest]
 MOV [fail,core_simpletest],[fail,tool_unittest]
 MOV [ignorefile,core_simpletest],[ignorefile,tool_unittest]
 MOV [ignorethisfile,core_simpletest],[ignorethisfile,tool_unittest]
 MOV [installtesttables,core_simpletest],[installtesttables,tool_unittest]
 MOV [moodleunittests,core_simpletest],[moodleunittests,tool_unittest]
 MOV [notice,core_simpletest],[notice,tool_unittest]
 MOV [onlytest,core_simpletest],[onlytest,tool_unittest]
 MOV [pass,core_simpletest],[pass,tool_unittest]
 MOV [pathdoesnotexist,core_simpletest],[pathdoesnotexist,tool_unittest]
 MOV [prefix,core_simpletest],[prefix,tool_unittest]
 MOV [prefixnotset,core_simpletest],[prefixnotset,tool_unittest]
 MOV [reinstalltesttables,core_simpletest],[reinstalltesttables,tool_unittest]
 MOV [retest,core_simpletest],[retest,tool_unittest]
 MOV [retestonlythisfile,core_simpletest],[retestonlythisfile,tool_unittest]
 MOV [runall,core_simpletest],[runall,tool_unittest]
 MOV [runat,core_simpletest],[runat,tool_unittest]
 MOV [runonlyfile,core_simpletest],[runonlyfile,tool_unittest]
 MOV [runonlyfolder,core_simpletest],[runonlyfolder,tool_unittest]
 MOV [runtests,core_simpletest],[runtests,tool_unittest]
 MOV [rununittests,core_simpletest],[rununittests,tool_unittest]
 MOV [showpasses,core_simpletest],[showpasses,tool_unittest]
 MOV [showsearch,core_simpletest],[showsearch,tool_unittest]
 MOV [skip,core_simpletest],[skip,tool_unittest]
 MOV [stacktrace,core_simpletest],[stacktrace,tool_unittest]
 MOV [summary,core_simpletest],[summary,tool_unittest]
 MOV [tablesnotsetup,core_simpletest],[tablesnotsetup,tool_unittest]
 MOV [testdboperations,core_simpletest],[testdboperations,tool_unittest]
 MOV [testtablescsvfileunwritable,core_simpletest],[testtablescsvfileunwritable,tool_unittest]
 MOV [testtablesneedupgrade,core_simpletest],[testtablesneedupgrade,tool_unittest]
 MOV [testtablesok,core_simpletest],[testtablesok,tool_unittest]
 MOV [thorough,core_simpletest],[thorough,tool_unittest]
 MOV [timetakes,core_simpletest],[timetakes,tool_unittest]
 MOV [totallines,core_simpletest],[totallines,tool_unittest]
 MOV [uncaughtexception,core_simpletest],[uncaughtexception,tool_unittest]
 MOV [uncoveredlines,core_simpletest],[uncoveredlines,tool_unittest]
 MOV [unittestprefixsetting,core_simpletest],[unittestprefixsetting,tool_unittest]
 MOV [unittests,core_simpletest],[unittests,tool_unittest]
 MOV [updatingnoninsertedrecord,core_simpletest],[updatingnoninsertedrecord,tool_unittest]
 MOV [version,core_simpletest],[version,tool_unittest]
AMOS END

MDL-29406 fix greedy config settings cleanup

MDL-29029 move profiling to admin tools

AMOS BEGIN
 MOV [calls,report_profiling],[calls,tool_profiling]
 MOV [cannotfindanyrunforurl,report_profiling],[cannotfindanyrunforurl,tool_profiling]
 MOV [cannotfindanyrunforrunid,report_profiling],[cannotfindanyrunforrunid,tool_profiling]
 MOV [comment,report_profiling],[comment,tool_profiling]
 MOV [differencesbetween2runsof,report_profiling],[differencesbetween2runsof,tool_profiling]
 MOV [executiontime,report_profiling],[executiontime,tool_profiling]
 MOV [cputime,report_profiling],[cputime,tool_profiling]
 MOV [lastrunof,report_profiling],[lastrunof,tool_profiling]
 MOV [markreferencerun,report_profiling],[markreferencerun,tool_profiling]
 MOV [memory,report_profiling],[memory,tool_profiling]
 MOV [pluginname,report_profiling],[pluginname,tool_profiling]
 MOV [profilingfocusscript,report_profiling],[profilingfocusscript,tool_profiling]
 MOV [profilingruns,report_profiling],[profilingruns,tool_profiling]
 MOV [profilingrunsfor,report_profiling],[profilingrunsfor,tool_profiling]
 MOV [referencerun,report_profiling],[referencerun,tool_profiling]
 MOV [runid,report_profiling],[runid,tool_profiling]
 MOV [summaryof,report_profiling],[summaryof,tool_profiling]
 MOV [viewdetails,report_profiling],[viewdetails,tool_profiling]
 MOV [viewdiff,report_profiling],[viewdiff,tool_profiling]
 MOV [viewdiffdetails,report_profiling],[viewdiffdetails,tool_profiling]
AMOS END

MDL-29029 move unsuproles to admin tools

AMOS BEGIN
 MOV [contextlevel,report_unsuproles],[contextlevel,tool_unsuproles]
 MOV [count,report_unsuproles],[count,tool_unsuproles]
 MOV [confirmdelete,report_unsuproles],[confirmdelete,tool_unsuproles]
 MOV [noprolbems,report_unsuproles],[noprolbems,tool_unsuproles]
 MOV [pluginname,report_unsuproles],[pluginname,tool_unsuproles]
AMOS END

MDL-29029 move capability overview to tools

AMOS BEGIN
 MOV [capabilitylabel,report_capability],[capabilitylabel,tool_capability]
 MOV [capabilityreport,report_capability],[capabilityreport,tool_capability]
 MOV [forroles,report_capability],[forroles,tool_capability]
 MOV [getreport,report_capability],[getreport,tool_capability]
 MOV [changeoverrides,report_capability],[changeoverrides,tool_capability]
 MOV [changeroles,report_capability],[changeroles,tool_capability]
 MOV [intro,report_capability],[intro,tool_capability]
 MOV [pluginname,report_capability],[pluginname,tool_capability]
 MOV [reportforcapability,report_capability],[reportforcapability,tool_capability]
 MOV [reportsettings,report_capability],[reportsettings,tool_capability]
 MOV [roleslabel,report_capability],[roleslabel,tool_capability]
AMOS END

MDL-29029 add new "Admin tool" plugin type

MDL-28329 local_qeupgradehelper make cron work.

MDL-29360 quiz comment.php has broken JS for the Cancel button.

This swtichest it to more modern YUI3 approach.

MDL-28259 Individual answers Feedback not shown in Cloze questions

MDL-29313 allow larger char fields

MDL-29321 tweak large varchar unit tests for oracle

MDL-29322 instruct oracle to use current NLS char size when creating VARCHAR2 fields

This solves problems on servers with default configuration where VARCHAR2 sizes are specified in bytes. Also add more reserved words.

MDL-29313 enforce varchar size limit

MDL-29314 enforce index size limits

MDL-29185 backup: Removed backup_log table and fixed the backup admin report

MDL-25937 Forms Library: Added Javascript validation for filepicker and filemanager. Also fixed disbledif rule check for both

MDL-25937 Froms Library: Added server side validation for filepicker and filemanager

weekly release 2.2dev

Merge branch 'install_master' of git://github.com/amosbot/moodle

Revert "MDL-29081 add support for proxy in TinyMCE GoogleSpell plugin"

This reverts commit 57638f2c05857bceea25909d0ef31ecf5f99b142.

MDL-29025 fix missing $ espacing

MDL-29276 fix missing global jerome in generate_simple_struct_class() - it breaks normal PHP-SOAP call

MDL-29366 qtype_essay import/export as Moodle XML loses files from graderinfo

MDL-29093 auth - help string now specifies MNet exception. Thanks Helen!

Merge branch 'w36_MDL-29081_m22_googlespellproxy' of git://github.com/skodak/moodle

Merge branch 'w36_MDL-28455_m22_tinymce' of git://github.com/skodak/moodle

MDL-29093 auth - help string changed to VBFET suggestion

(very best favourite english translator, aka. Helen :-P)

MDL-28455 bump up editor version file

MDL-29188 course_formats Fixed up formatting of section name within navigation

Merge branch 'wip-MDL-29093-master' of git://github.com/samhemelryk/moodle

MDL-29295 do not use strtok in dml and ddl layers

This prevents clobbering of internal pointer when code calling DML
uses strtok too. Unit test added to prevent future uses.

Merge branch 'w36_MDL-29326_m22_sqlsrv' of git://github.com/skodak/moodle

Merge branch 'w36_MDL-29328_m22_adodb' of github.com:skodak/moodle

Merge branch 'w36_MDL-29351_m22_tempregr' of git://github.com/skodak/moodle

MDL-29351 add missing temp and cache dirs to installers

MDL-26257 Authentication : whitespace/style fixes

Merge branch 'MDL-26257' of git://github.com/bostelm/moodle

Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle
- resolved conflicts, minor whitespace and fixed quote.
- note: textlib_get_instance() is already deprecated

Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle
  - resolved conflict.

Merge branch 'wip-MDL-29188-master' of git://github.com/samhemelryk/moodle

Merge branch 'master' of git.moodle.org:/git/integration

Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle
 - resolved conflicts.

Merged branch '28595_m22_installcontinue' of git://github.com/skodak/moodle with changes

MDL-29093 - Authentication improved new setting name and strings

MDL-29093 - Authentication for authentication only, not for user creation

There are cases when a moodle installation needs to only deal
user authentication and not user creation (this is especially
interesting when using external authentication sources such as LDAP,
CAS, etc.)

Add an option to prevent automatic user creation if the administrator
does't want users to be automatically created.

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>

Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle

MDL-29189 course Minor fixups after code review

Merge branch 'wip-MDL-23534-master' of git://github.com/samhemelryk/moodle

Merge branch 'MDL-29236-master' of git://github.com/sammarshallou/moodle

MDL-15377 filterlib - whitespace fixes

Merged branch 'MDL-22232_easier_turn_off_notifications' from git://github.com/andyjdavis/moodle.git with conflict resolution

Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle

MDL-29211 fix for master

MDL-29326 add support for auth and enrol using mssqlnative adodb driver

MDL-29328 update 3rd party library list with new adodb version

MDL-29328 import latest adodb

Merge branch 'w36_MDL-28701_m22_tempcachedir' of git://github.com/skodak/moodle

MDL-22232 messaging: added the ability to temporarily disable notifications to a particular user

Merge branch 'w36_MDL-29025_m22_verboseauthdb' of git://github.com/skodak/moodle

MDL-29112 trigger event mod_deleted after deleting mod through AJAX

Merge branch 'MDL-28724' of git://github.com/nebgor/moodle

Merge branch 'w36_MDL-29131_m22_recentsep' of git://github.com/skodak/moodle

Merge branch 'w36_MDL-29175_m22_clozearray' of git://github.com/skodak/moodle

Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle

MDL-28724 wiki : Fixed bugs in wiki forms

Merge branch 'w36_MDL-29306_m22_dbenrolroles' of git://github.com/skodak/moodle

Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle