Merge branch 'MDL-46206-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 16:25:04 +0000 (17:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 16:25:04 +0000 (17:25 +0100)
1  2 
lib/outputrenderers.php

Simple merge