Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 00:52:16 +0000 (13:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 00:52:16 +0000 (13:52 +1300)
1  2 
mod/assign/renderer.php

Simple merge