Merge branch 'MDL-54945-master-workshopportfolio' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Oct 2016 11:06:42 +0000 (12:06 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Oct 2016 11:06:42 +0000 (12:06 +0100)

Trivial merge