Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 09:13:35 +0000 (17:13 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 09:13:35 +0000 (17:13 +0800)
1  2 
files/renderer.php
lib/form/filemanager.js

Simple merge
Simple merge