Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 18 Jun 2012 09:14:11 +0000 (17:14 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 18 Jun 2012 09:14:11 +0000 (17:14 +0800)
1  2 
lib/form/filemanager.js

Simple merge