Merge branch 'MDL-53899-master-pluginperm' of git://github.com/mudrd8mz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 May 2016 02:28:33 +0000 (10:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 May 2016 02:28:33 +0000 (10:28 +0800)

Trivial merge