Merge branch 'wip-MDL-36690-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Aug 2013 03:35:27 +0000 (11:35 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Aug 2013 03:35:27 +0000 (11:35 +0800)
1  2 
course/lib.php
lib/modinfolib.php

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