Merge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 11 May 2012 04:40:38 +0000 (12:40 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 11 May 2012 04:40:38 +0000 (12:40 +0800)
fix moved into medialib.php

Conflicts:
filter/mediaplugin/filter.php


Trivial merge