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)
Conflicts:
backup/moodle2/restore_stepslib.php

1  2 
backup/moodle2/restore_stepslib.php
course/view.php

Simple merge
diff --cc course/view.php
Simple merge