Merge branch 'w39_MDL-29555_m22_yui341' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 2 Oct 2011 23:06:15 +0000 (01:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 2 Oct 2011 23:06:15 +0000 (01:06 +0200)

Trivial merge