Merge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 10:06:22 +0000 (12:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 10:06:22 +0000 (12:06 +0200)

Trivial merge