Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle
commitdae0c90dbd443df9fda1d377c489f1eb56fe2dcf
authorSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 21:15:48 +0000 (20 09:15 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 21:15:48 +0000 (20 09:15 +1200)
treefcafefa459edff3ed9e6634a70434cd4dd5e710b
parentf189c540b9904602d59560dd5eb2f284d4594a6d
parentd01ebb940d868c7020708fe318f99b4599ff8660
Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle
repository/filepicker.js