Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2012 23:58:48 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2012 23:58:48 +0000 (01:58 +0200)
1  2 
theme/base/style/filemanager.css

Simple merge