Merge branch 'MDL-47806' of github.com:mr-russ/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Nov 2014 06:34:43 +0000 (14:34 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Nov 2014 06:34:43 +0000 (14:34 +0800)
1  2 
lib/outputrenderers.php

Simple merge