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)
commitddd492ad7fad4272cdfd69371255a081fcb534fa
tree409f390ff9a7fdaf392759974f699a45dc5e009f
parent50a8374ef84f66548881e20538be732c447ce86a
parent185d90ad278f8c3dfa619085602ec9bbc4e8261d
Merge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle

fix moved into medialib.php

Conflicts:
filter/mediaplugin/filter.php