Merge branch 'MDL-46984_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Oct 2014 20:16:40 +0000 (09:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Oct 2014 20:16:40 +0000 (09:16 +1300)
1  2 
course/renderer.php

Simple merge