Merge branch 'w42_MDL-29881_m22_profiling' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2011 14:17:40 +0000 (16:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2011 14:17:40 +0000 (16:17 +0200)
1  2 
lib/setuplib.php
lib/thirdpartylibs.xml

Simple merge
Simple merge