Merge branch 'w04_MDL-26096_20_catenrol' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 03:57:06 +0000 (11:57 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 03:57:06 +0000 (11:57 +0800)
commitb6c7558c2d38d73238bfd9d70a0cc149c51c43d9
treec194ce0b5d7967e719cf85e06d32659d0a4789f4
parent0243d7eb2f0cbef8a916acdf4d390b5b91de65a0
parentcde91f5a9bc1af8d735a3485f01019ec019cd401
Merge branch 'w04_MDL-26096_20_catenrol' of git://github.com/skodak/moodle