Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 02:19:02 +0000 (10:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:26:54 +0000 (16:26 +0100)
1  2 
lib/outputrenderers.php

Simple merge