Merge branch 'wip-MDL-33795-master' of https://github.com/barbararamiro/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Jul 2012 05:14:08 +0000 (17:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Jul 2012 05:14:08 +0000 (17:14 +1200)
1  2 
theme/base/style/filemanager.css

Simple merge