Merge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:45:50 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:45:50 +0000 (00:45 +0100)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge