Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 06:17:40 +0000 (14:17 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 06:17:40 +0000 (14:17 +0800)
1  2 
course/renderer.php

Simple merge