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)
commit6e471afe8b76f5a134ef8a1cbeaa8647e01e5db3
tree9c7cd60672c859b62d47cf491a9501d362b6ee03
parentb19af5b41c80d122dfa0e5ca4a61ef2e70549de1
parent1778f310f3ecf6995a5040191ac4815a0bd9a90a
Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle
files/renderer.php
repository/filepicker.js
theme/base/style/filemanager.css