Merge branch 'MDL-39491-workshop-media' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 May 2013 12:11:46 +0000 (13:11 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 May 2013 12:11:46 +0000 (13:11 +0100)

Trivial merge