Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 05:52:31 +0000 (13:52 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 05:52:31 +0000 (13:52 +0800)
commit7eae2c5ae2d2001fef660d7a5101f356f8472231
treee1b6a63095406b356193b1df79ba8da07b2d76f0
parentf7dd6bda3113530ca24a11b88261271fab5b435f
parent63390481c496fb13c4a7a119a913e2471216ec68
Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle
  - resolved conflict.
backup/util/ui/renderer.php
blocks/course_list/block_course_list.php
course/delete.php
course/lib.php
lib/accesslib.php
lib/navigationlib.php
mod/feedback/item/info/lib.php