Merge branch 'w37_MDL-29029_m22_admintools' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2011 16:26:55 +0000 (18:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2011 16:26:55 +0000 (18:26 +0200)
1  2 
admin/tool/xmldb/actions/edit_field/edit_field.js
admin/tool/xmldb/actions/edit_field_save/edit_field_save.class.php
lib/db/upgrade.php
lib/moodlelib.php
theme/base/style/admin.css

Simple merge
Simple merge
Simple merge