MDL-34129 show course info on enrolment page
Merge branch 'MDL-26969_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
MDL-26969 assignment : clarified phpdoc and fixed whitespace.
MDL-34519 - Course reset not protected by proper capability
Merge branch 'MDL-27083-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
MDL-34529: Fixed ordering of course sections when performing import/restore by adding the sort parameter.
MDL-27083 - upgrade: fix incorrect version number
Merge branch 'MDL-13629_droplow_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
Automatically generated installer lang files
Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE
MDL-34255 group calendar events: fixed adding group calendar event for students
weekly release 2.2.4+
MDL-34589 quiz report graphs: PHP5.4 issue with unset($array[$float]).

Thanks to Matthew Davidson for diagnosing the problem.
MDL-30515 grade Removing duplicate values to avoid upgrade to 2.x crash
MDL-32931 mod_forum Change forum overview to avoid use of (potentially large and slow ) log table.
MDL-32931 mod_forum Polishing patch and taking into account courses without previous accesses
MDL-32499 gradingform_rubric Avoid backup/restore of rubric fillings without an existing criteria
MDL-34507 Filepicker: Repositories with specific filetypes are displayed when expected
MDL-25953 Repository: Updated Amazon S3 library

Conflicts:

	repository/s3/lib.php
MDL-25953 Repository: Amazon S3 supports sub directories

Conflicts:

	repository/s3/lib.php