Merge branch 'MDL-35922-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 03:33:09 +0000 (15:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 03:33:09 +0000 (15:33 +1200)
1  2 
files/renderer.php

Simple merge