Merge branch 'MDL-36095-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 23:23:37 +0000 (12:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 23:23:37 +0000 (12:23 +1300)
1  2 
course/format/renderer.php

Simple merge