Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:11:23 +0000 (12:11 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:11:23 +0000 (12:11 +1200)

Trivial merge