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)

Trivial merge