Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 09:08:18 +0000 (17:08 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 09:08:18 +0000 (17:08 +0800)
1  2 
lib/form/filemanager.js

Simple merge