Merge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 08:11:41 +0000 (10:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 08:11:41 +0000 (10:11 +0200)

Trivial merge