Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 07:37:36 +0000 (15:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 07:37:36 +0000 (15:37 +0800)

Trivial merge