Merge branch 'MDL-31656-master-3' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:09:29 +0000 (11:09 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:09:29 +0000 (11:09 +1300)
commit8498e630af25bc30929b6b9d8d4099edb2648f24
tree102888a3b17fcd094fbae73939dc984422793f49
parenta5dd1f4fb720545a75b1e7e391a1ec5bbdac4a39
parentf0a163ed6d8ef2a65968c12f7b01ad73ff050d93
Merge branch 'MDL-31656-master-3' of git://git.luns.net.uk/moodle
lib/form/filemanager.js