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)
commit1cf840074b269ee730c554d405cd895c979b1425
tree178bf38453426df405591ad2a43072a9a5821409
parentf27735e470c8be9eea05a7dc8760b372784bf059
parent7c3e665289bc824bab2f4c3106323a8c8b5359ee
Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle
files/renderer.php
lib/form/filemanager.js