Merge branch 'w34_MDL-34864_m23_enrolcat' of git://github.com/skodak/moodle into...
authorDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 06:28:03 +0000 (14:28 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 06:28:03 +0000 (14:28 +0800)

Trivial merge