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)
commitca08b132e37477c7901aacff2c11cdef02324e33
tree96e90638c4e150268896865d2150f41e882170c2
parent83be8fce3a5849f37ce90600d291d02ee97f7754
parent7c725a24b354fc6dcd797120f2ac59c26856abe4
Merge branch 'MDL-25860_20_wip_grpblocks' of git://github.com/skodak/moodle