Merge branch 'w07_MDL-26030_20_mediafilter' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 00:09:07 +0000 (01:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 00:09:07 +0000 (01:09 +0100)

Trivial merge