Merge branch 'MDL-32639-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:46:34 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:46:34 +0000 (14:46 +0800)
1  2 
theme/base/style/filemanager.css

Simple merge