Merge branch 'MDL-40953-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 00:45:20 +0000 (12:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 00:45:20 +0000 (12:45 +1200)
1  2 
course/renderer.php

Simple merge