MDL-47428 language: fixed typo
Merge branch '47428-28' of git://github.com/samhemelryk/moodle
MDL-47404 filelib: Prevent flash from treating files as uploads
added to send_stored_file as well.
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
MDL-47214 core: IPs should be cleaned
Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle
Revert "MDL-45893 user_menu: revised based on action_menu"

Was not yet ready for the prime time.

This reverts commit dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css