Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:56:12 +0000 (11:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:56:12 +0000 (11:56 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge