Merge branch 'MDL-33466-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 21:37:38 +0000 (09:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 21:37:38 +0000 (09:37 +1200)
commitdc31e8d73d72f4fe5c74f45694ce5eaaf58873d5
treea219ea4dbb019d0cf9cc6d0897fbf3ca567482ab
parentc425663c4c97ad0523335923fc7851712f2799f8
parenta098f340fe2864d91ac056fc90250564883e62a9
Merge branch 'MDL-33466-master' of git://github.com/sammarshallou/moodle
lib/modinfolib.php