Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 08:46:13 +0000 (09:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 08:46:13 +0000 (09:46 +0100)
1  2 
course/lib.php
course/tests/courselib_test.php

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