Merge branch 'w06_MDL-26219_20_upgradelog' of git://github.com/skodak/moodle