Merge branch 'MDL-42648_M26' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 4 Nov 2013 06:00:30 +0000 (14:00 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 4 Nov 2013 06:00:30 +0000 (14:00 +0800)
1  2 
lib/outputrenderers.php

Simple merge