Merge branch 'MDL-36808-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 04:18:12 +0000 (12:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 04:18:12 +0000 (12:18 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge