Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:57:49 +0000 (16:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:57:49 +0000 (16:57 +0800)
1  2 
course/renderer.php

Simple merge