Merge branch 'MDL-37173-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 20:56:49 +0000 (21:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 20:56:49 +0000 (21:56 +0100)
1  2 
lib/form/filemanager.js

Simple merge