Merge branch 'MDL-40947-master' of https://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:39:41 +0000 (17:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:39:41 +0000 (17:39 +1200)
1  2 
lib/modinfolib.php

Simple merge