Merge branch 'm_MDL-30988_adding_preference_api_phpdocs' of git://github.com/gerrywas...
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 22:59:48 +0000 (11:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 22:59:48 +0000 (11:59 +1300)
1  2 
lib/moodlelib.php

Simple merge