Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Mar 2012 21:44:04 +0000 (10:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Mar 2012 21:44:04 +0000 (10:44 +1300)
1  2 
lib/moodlelib.php

Simple merge