Merge branch 'MDL-36752-master' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:32:34 +0000 (13:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:32:34 +0000 (13:32 +0800)
1  2 
lib/javascript-static.js
lib/outputrenderers.php

Simple merge
Simple merge