Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 23:42:48 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 23:42:48 +0000 (01:42 +0200)
1  2 
lib/setup.php
lib/thirdpartylibs.xml

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