MDL-39363 scorm: Accept 0 as a valid score
MDL-39640 repository: Prevent notice when editing an instance
NOBUG: Keep backup YYYYMMDD on sync with 2.5
MDL-28250 license: Correct cc-nc url
MDL-28250 license: upgrade old versions of cc-nc

The url was incorectly defined in previous versions
MDL-39374 log only real folder edits

Credit goes to Florian Zillner, thanks.
MDL-39678 fix YUI 20130515 vulnerability
MDL-39697 theme_bootstrapbase: Updated $THEME->layouts in config.php to match those in Base theme.
Merge branch 'w18_MDL-39678_m25_yui' of git://github.com/skodak/moodle into MOODLE_25_STABLE
MDL-39717 behat: Add info to experimental steps definitions

JS modal dialogs and drag & drop should be
considered experimental as the steps are not
working as expected in all OS/browser combinations.
MDL-39717 behat: Removing unstable steps and scenarios
MDL-39528 behat: Avoid modal window suite failure

Catching JS alerts/confirms exceptions and
auto-accepting them before each test run to
avoid chained scenarios failures.
Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
MDL-38369 repository: Remove output before redirect
MDL-39198 theme_formal_white: resized and relocated the "Add..." drop down menu of the "Add a block" pseudo block
MDL-39630 theme_afterburner: Improving the way course/category listings display.
Merge branch 'MDL-39528_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
MDL-36020 overview/report: fix quiz regrade session lock
MDL-39728 List all the classes in question/type/questionbase.php

This should make it easier for people to understand the type hierarchy.