Merge branch 'm27_MDL-43852_SWF_Not_Embedded_By_Mediaplugin_Filter' of https://github...
authorDan Poltawski <dan@moodle.com>
Tue, 4 Mar 2014 04:56:08 +0000 (12:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Mar 2014 04:56:08 +0000 (12:56 +0800)

Trivial merge