Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 8 Oct 2013 00:52:39 +0000 (11:52 +1100)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Oct 2013 00:52:39 +0000 (11:52 +1100)

Trivial merge