Merge branch '42057-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 23:20:18 +0000 (07:20 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 23:20:18 +0000 (07:20 +0800)
1  2 
lib/outputrenderers.php

Simple merge