Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 23:20:13 +0000 (00:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 23:20:13 +0000 (00:20 +0100)
commit06b3d9c8c09d2590ef3781af27ccb1cadaa112fa
treeb9c65fe15a780ce9d3974af34d29531ad835fa01
parentd59df6582bd4c1b5a85a0907d76ac6e2b28da8e1
parent4db41cbdcf860f186bc9b050e4116de3458724d5
Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle

Conflicts:
theme/canvas/style/course.css
theme/canvas/style/course.css