Official Moodle git projects - moodle.git/commit

Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

backup/moodle2/backup_stepslib.php	diff1 \|	diff2 \|	blob \| history
lib/db/install.xml	diff1 \|	diff2 \|	blob \| history
lib/db/upgrade.php	diff1 \|	diff2 \|	blob \| history
theme/base/style/core.css	diff1 \|	diff2 \|	blob \| history
version.php	diff1 \|	diff2 \|	blob \| history

Moodle official production repository

backup/moodle2/backup_stepslib.php	diff1 \|	diff2 \|	blob \| history
lib/db/install.xml	diff1 \|	diff2 \|	blob \| history
lib/db/upgrade.php	diff1 \|	diff2 \|	blob \| history
theme/base/style/core.css	diff1 \|	diff2 \|	blob \| history
version.php	diff1 \|	diff2 \|	blob \| history