Merge branch 'w14_MDL-32149_m23_phpunit2' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 23:32:15 +0000 (01:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 23:32:15 +0000 (01:32 +0200)
1  2 
lib/moodlelib.php

Simple merge