Merge branch 'MDL-32771-2' of git://github.com/danpoltawski/moodle
commitb34e00c19794aa603150ed783be8346ff1f5153b
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 21:14:20 +0000 (9 09:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 21:14:20 +0000 (9 09:14 +1200)
tree044160a0967ea061c09c32a8f78d976888e968d3
parentf7ae27e887a9353167f29566fae14b927fe9f991
parent3a35a9ff8b36b954e9554c5b519648793c9359d3
Merge branch 'MDL-32771-2' of git://github.com/danpoltawski/moodle
course/format/renderer.php
theme/base/style/course.css