MDL-40443 setType notice in quiz reports.
MDL-40499 Edit question from 1.9 backup breaks if images in subdirs
MDL-40512 SCORM: prevent undefined warning
MDL-40527 enrol meta: respect $CFG->courselistshortnames

Thanks to James Henestofel for working this out in MDL-37558. That issue
got complex, so I am just submitting this simple part of it for
integration.
Moodle release 2.4.5
MDL-39832 Files: Revert MDL-39688 commit, 7c742620d26bdba53e136fda293d33b5271ce241

MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
MDL-39832 Files: Fixed ETag format according with RFC2616.

ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
MDL-40450 update links to TinyMCE 3.x docs
Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

Conflicts:
	version.php
MDL-38314 repository: Removed >= 2.5 code logic
Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
MDL-40195: mod_assign: Display grades when quickgrading to 2 decimal places
MDL-40436: auth_ldap: Fixed warning when adding new LDAP users
Merge branch 'MDL-40434_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
Merge branch 'MDL-40318_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
MDL-40035: Avoid rebuild_course_cache always for empty course
MDL-40388 Reset globals after each unit test
MDL-40386: Fix for updating timemodified field in book_chapters
Merge branch 'MDL-40499_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE
MDL-40176 mock_submit method for testing

Conflicts:

	lib/formslib.php