Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Jul 2012 04:01:54 +0000 (16:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Jul 2012 04:02:49 +0000 (16:02 +1200)
commita2a2e7fb4a2cd8bb23eebc72dbb6b4392a86d010
tree7ce40cb728ada9b9583b212c0775ed9ad45d744e
parentcfd5687407c4756e48ffb505081a902dad27abbd
parent46eca1f77ed63f88157e7124633d51648bfa4fcd
Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle

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