Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 03:02:07 +0000 (11:02 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 03:02:07 +0000 (11:02 +0800)

Trivial merge