Merge branch 'MDL-51932-master-workshopswitch' of git://github.com/mudrd8mz/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 24 Apr 2017 00:34:06 +0000 (08:34 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 24 Apr 2017 00:34:06 +0000 (08:34 +0800)

Trivial merge