Merge branch 'MDL-53717_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 21:20:31 +0000 (22:20 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 21:20:31 +0000 (22:20 +0100)
1  2 
lib/outputrenderers.php

Simple merge