Merge branch 'w51_MDL-37297_m25_enrolcatprogress' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:48:13 +0000 (10:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:48:13 +0000 (10:48 +0800)

Trivial merge