Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 7 Jun 2012 06:04:08 +0000 (14:04 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 7 Jun 2012 06:04:08 +0000 (14:04 +0800)
commitac16f1451204739fb8d1df3b62931303c66304c8
tree7489eb49b3c360328932da3ccdfc06adbae2100f
parent25f288f2fdf05e9a8da9b748bde56e90c24ffd1a
parent336d8c49f475bffe709665752809447c07b0eb0a
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle

Conflicts:
backup/moodle2/restore_stepslib.php
backup/moodle2/restore_stepslib.php
course/view.php