Aparup Banerjee 9e4d54e15d Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle
Conflicts:
	theme/base/style/core.css
	theme/base/style/filemanager.css
2012-06-19 16:09:43 +08:00
..