Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 04:16:37 +0000 (12:16 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 04:16:37 +0000 (12:16 +0800)

Trivial merge