Merge branch 'MDL-33640_master' of git://github.com/MaxThrax/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Aug 2012 23:48:40 +0000 (11:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Aug 2012 23:48:40 +0000 (11:48 +1200)
1  2 
repository/filepicker.js

Simple merge