Merge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 04:32:23 +0000 (12:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 04:32:23 +0000 (12:32 +0800)
1  2 
lib/outputrenderers.php

Simple merge