Merge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle

fix moved into medialib.php

Conflicts:
	filter/mediaplugin/filter.php
This commit is contained in:
Aparup Banerjee 2012-05-11 12:40:38 +08:00
commit ddd492ad7f

Diff Content Not Available