Merge branch 'w38_MDL-29533_m22_yui341pr1' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Sep 2011 10:12:57 +0000 (12:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Sep 2011 10:12:57 +0000 (12:12 +0200)

Trivial merge