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

Trivial merge