Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 2 Apr 2014 00:04:46 +0000 (13:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 2 Apr 2014 00:04:46 +0000 (13:04 +1300)

Trivial merge