Merge branch 'MDL-54833-master-workshopuserplan' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2016 18:46:30 +0000 (20:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2016 18:46:30 +0000 (20:46 +0200)

Trivial merge