Merge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Mar 2016 04:25:57 +0000 (05:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Mar 2016 04:25:57 +0000 (05:25 +0100)
1  2 
lib/outputrenderers.php

Simple merge