Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:04:21 +0000 (20:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:04:21 +0000 (20:04 +0100)
1  2 
course/index.php
course/lib.php

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