Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 02:51:45 +0000 (15:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 02:51:45 +0000 (15:51 +1300)

Trivial merge