Merge branch 'wip-mdl-33027' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 03:54:30 +0000 (11:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 03:54:30 +0000 (11:54 +0800)
1  2 
course/format/renderer.php

Simple merge