Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)
commitbfb5580f92ec8213c67d887b60ef2e374b87111a
treea5c26b9b2b472623ec2bc1596ff47803b94cd21f
parent81a38f50fb476e19877618b404fe9719573a8307
parentc24cd394486019487ccf890cec1df7d9a7f0f988
Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle
lib/filelib.php
lib/form/filemanager.js
theme/base/style/filemanager.css