Merge branch 'MDL-35931-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:38:33 +0000 (08:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:38:33 +0000 (08:38 +1200)
1  2 
files/renderer.php

Simple merge