Merge branch 'wip-MDL-41508-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2013 12:09:34 +0000 (14:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2013 12:09:34 +0000 (14:09 +0200)
1  2 
course/lib.php
course/tests/courselib_test.php

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