Merge branch 'wip-MDL-52008-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 05:16:06 +0000 (13:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 05:16:06 +0000 (13:16 +0800)
1  2 
lib/javascript-static.js
lib/outputrenderers.php

Simple merge
Simple merge