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)
commitcae0c46b9b704949bb38965501382f961780969f
tree7830b62879d247d96a163b031396a67bef9c5d9a
parentc69183a40fa815e9eb604efc83213830173a8f26
parent5429afc0421fc0068592538f63d162b5b6a2d112
Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle