Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:00:17 +0000 (18:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:00:17 +0000 (18:00 +0100)
1  2 
course/renderer.php

Simple merge