Merge branch 'MDL-25754_20_wip' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 05:47:31 +0000 (13:47 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 05:47:31 +0000 (13:47 +0800)
1  2 
lib/moodlelib.php

Simple merge