Merge branch 'w38_MDL-29509_m22_admintool2' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 23:52:23 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 23:52:23 +0000 (01:52 +0200)

Trivial merge