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

Trivial merge