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)
commit4fd25ab95cfbf68c6d6586a13e3f18ce4222780c
tree1e5d799358e6deb92363c365c87899e330512518
parent88c3ba8c06616696e104b188360ebe901d7e69b9
parentc371e39316e984692a2fe5ae09e8be509863530e
Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle