Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 04:38:25 +0000 (17:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 04:38:25 +0000 (17:38 +1300)

Trivial merge