Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 22:40:39 +0000 (23:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 22:40:39 +0000 (23:40 +0100)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge