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)
commit4d00df46b19132fa0abae690a4f5ff3bd7569e53
treed74ed7d2f720db1f0c71066f8cc0f559da43b80f
parentd1050e406f0262eed1f00536ae568ce89adc6182
parent38fc0130258644a312f0a773d375b7dcef559421
Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle