Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)
commit73ec069e3bc4468bb80b6396f04ef145fd0e39b4
treeb3a5f8f112cd847febe4d92eee143df7cca5fcf7
parentc94972381759fd45f7a637b2ac8f8f8a2be92129
parent83d2700ec9a3d03fa98fd33512534d6bd2f75d21
Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle
lib/form/filemanager.js
repository/boxnet/lib.php
repository/upload/lib.php