Merge branch '48026-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:33:46 +0000 (00:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:33:46 +0000 (00:33 +0100)
1  2 
lib/outputrenderers.php

Simple merge