Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 20:30:02 +0000 (08:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 20:30:02 +0000 (08:30 +1200)
1  2 
course/view.php

diff --cc course/view.php
Simple merge