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)
1  2 
lib/modinfolib.php

Simple merge