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)
commitd99a3005639adf28c6aa8df88688a53482d591f9
tree62a6e8af25a45873f7bf9fed47b947ac3303b0ae
parent487caf6b65cf660de815de61265125c348f6333a
parent4fcdb0123c3584c8d437cf46f8833568ec419b54
Merge branch 'wip-MDL-36690-master' of git://github.com/marinaglancy/moodle
course/lib.php
lib/modinfolib.php