Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 22:42:43 +0000 (00:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 22:42:43 +0000 (00:42 +0200)
commit238f7761aff584fe4a0c8afa2eeec3a67a57e08a
treeb892612752ad0dbd14ee5380217682a4260ea1c9
parent71ff7c2c043b682c7211ef4481801cdf12b30e41
parent1d1917aeaa4380479494d7f08aa2e55c1277ef4b
Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle

Conflicts:
lib/db/upgrade.php
backup/moodle2/backup_stepslib.php
backup/moodle2/restore_stepslib.php
lib/db/install.xml
lib/db/upgrade.php