Merge branch 'w04_MDL-37716_m25_enrolexpiry' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Jan 2013 01:56:57 +0000 (14:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Jan 2013 01:56:57 +0000 (14:56 +1300)

Trivial merge