Merge branch 'w07_MDL-26153_20_yuicombo' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 01:10:11 +0000 (02:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 01:10:11 +0000 (02:10 +0100)

Trivial merge