Merge branch 'w37_MDL-29406_m22_configdelete' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 01:32:37 +0000 (13:32 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 01:32:37 +0000 (13:32 +1200)

Trivial merge