Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle
MDL-37225 reset cachstore_static store when purging
Automatically generated installer lang files
MDL-35653 - mod/wiki: Force format now lets users edit wiki pages.

Thanks to Tõnis Tartes for part of this solution.

When force format was selected in the options, trying to view the
wiki would redirect to the front page with a message saying that
you do not have permission to edit this page. Students had no way
of viewing any entries or creating the first page.

When in force format it skips a page , which would be considered
uncessary for students, but this means that the group id is not set
and this is what is causing most of the problems.

I also have included a check to see if the title is default and whether
the user has permission to view all groups. In these situations the
intermediate page is displayed.
MDL-37171 fix some more E_STRICT issues

Credit goes to Mark Nelson, thanks.
MDL-32245 question bank: update URL after moving question between categories.

Also, improve the URL when you go to edit the questions in a category.
Automatically generated installer lang files
Revert "MDL-36704: wrap pending conditions in span tags"

This reverts commit 5e9fd83df8f2c175681fa5a81d36df5ee313cb1e.
MDL-37015 Resource: link in onclick should not contain html special char
MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button
Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle
MDL-4781 forum: show discussion link when user has ability to view discussion
MDL-25630 moodle/index.php: Wraps individual front page content elements (Site news/Course list/Category names/Category combo) in divs with descriptive classes so they can be styled individually.
MDL-35130 shibboleth: remove hard-coded string
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
weekly on-sync release 2.5dev
MDL-37186 add the ultimate TinyMCE custom parameter setting
MDL-37183 remove ancient unused excel library
MDL-37125 import latest YUI 3.8.0
MDL-36898 use only enrolled users as course contacts