Merge branch 'w02_MDL-30969_m23_suspendedcsv' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Jan 2012 00:02:31 +0000 (13:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Jan 2012 00:02:31 +0000 (13:02 +1300)

Trivial merge