Merge branch 'MDL-25860_20_wip_grpblocks' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:36:10 +0000 (15:36 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:36:10 +0000 (15:36 +0800)

Trivial merge