Merge branch 'MDL-33917-2' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE
Merge branch 'MDL-32310-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE
Merge branch 'MDL-28155_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
Merge branch 'MDL-26145_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
MDL-33624 lang - remove incosistent use of placeholder
Merge branch 'MDL-33624-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE
Merge branch 'MDL-34164_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
Merge branch 'w29_MDL-34271_m22_mysqlcollation' of git://github.com/skodak/moodle into MOODLE_22_STABLE
Merge branch 'MDL-31622-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
MDL-30798 Blog: link param for entries about this course link is fixed
Merge branch 'wip-mdl-30798-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
Merge branch 'MDL-23219_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
MDL-26587 Question : fixed restoring shortanswer where answers are missing due to data error in mbz file.
Merge branch 'MDL-34187_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
MDL-30876 filter_mediaplugin Wrapping the style sheets access with try & catch

Conflicts:

	lib/javascript-static.js
Automatically generated installer lang files
MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results
Merge branch 'MDL-33575_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
MDL-33560 Enrol: Enrol password can be unmasked
MDL-13629 grade: added some unit tests to clarify the handling of droplow and improved apply_limit_rules()