Merge branch 'MDL-24419' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 03:19:02 +0000 (11:19 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 03:19:02 +0000 (11:19 +0800)
1  2 
course/lib.php
course/view.php
index.php

diff --cc course/lib.php
Simple merge
diff --cc course/view.php
Simple merge
diff --cc index.php
Simple merge