Merge branch 'MDL-36548_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:45:04 +0000 (14:45 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:45:04 +0000 (14:45 +0800)
1  2 
repository/filepicker.js

Simple merge