Merge branch 'MDL-55020-master-pluginzip' of git://github.com/mudrd8mz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 02:54:59 +0000 (10:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 02:54:59 +0000 (10:54 +0800)

Trivial merge