Merge branch 'w16_MDL-32448_m23_yui350' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Apr 2012 22:29:35 +0000 (00:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Apr 2012 22:29:35 +0000 (00:29 +0200)
1  2 
lib/setup.php
lib/thirdpartylibs.xml

diff --cc lib/setup.php
Simple merge
Simple merge