MDL-42697 Theme: Fix overflow on docked blocks
Merge branch 'MDL-42697-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE
Merge branch 'MDL-42668-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Automatically generated installer lang files
Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE
weekly release 2.4.6+
Moodle release 2.4.7
MDL-42043 theme: Use $theme instead of $OUTPUT for pix_url()

Conflicts:

	theme/afterburner/lib.php