Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Nov 2014 17:16:00 +0000 (17:16 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Nov 2014 17:16:00 +0000 (17:16 +0000)

Trivial merge