Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 19 Jun 2012 08:09:43 +0000 (16:09 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 19 Jun 2012 08:09:43 +0000 (16:09 +0800)
commit9e4d54e15d0ced74f5ae246d1b7401b559479ee6
tree0e35e7a492c1d7337c8ed6459021f9db6afe5201
parent139d3639c8709d3c27f29a9aa679021301867cf6
parentaf9c48cbe9bbfef2e71623dd282fa0c74ae66a2b
Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle

Conflicts:
theme/base/style/core.css
theme/base/style/filemanager.css
files/renderer.php
theme/base/style/core.css
theme/base/style/filemanager.css