Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:19:06 +0000 (11:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:19:06 +0000 (11:19 +1200)
commitc31081d0a46d4c8a89d61dc99a6f47d994e2f3ec
treeadf0f1bbf83b452a322127673a0dc972af4bdfe1
parentc994797ea9d6f03d535ebc50e2fbe2608661b371
parent34b84d45b6abfdbbc325635bd88893b7d3052b8a
Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle

Conflicts:
version.php
backup/moodle2/restore_stepslib.php
version.php