Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 08:20:02 +0000 (16:20 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 08:20:02 +0000 (16:20 +0800)

Trivial merge