Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 23:56:49 +0000 (11:56 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 23:56:49 +0000 (11:56 +1200)
commit088c374a6d306f4bbb0ad26c099e29c4be645a23
tree06ff56497dcd1896062c1bff9748572f609ce5bb
parenta273391e4acac0c4a8458d25ada52e15bfcbd49d
parent7b5f67f77fbed8f4876edab00df21d39d9bad7ea
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
lib/db/install.xml
lib/db/upgrade.php
theme/base/style/core.css
version.php