Merge branch 'wip-MDL-33303-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2012 14:18:41 +0000 (16:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2012 14:18:41 +0000 (16:18 +0200)
1  2 
files/renderer.php
lib/form/filemanager.js
theme/base/style/filemanager.css

Simple merge
Simple merge
Simple merge