Merge branch 'wip-MDL-44287-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:18:21 +0000 (14:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:18:21 +0000 (14:18 +0800)
1  2 
course/modlib.php

Simple merge