Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 05:42:19 +0000 (13:42 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 05:42:19 +0000 (13:42 +0800)
1  2 
files/renderer.php
repository/filepicker.js
theme/base/style/filemanager.css

Simple merge
Simple merge
Simple merge