Merge branch 'MDL-44357-master-noplugin' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Mar 2014 19:56:49 +0000 (08:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Mar 2014 19:56:49 +0000 (08:56 +1300)
1  2 
lib/outputlib.php

Simple merge