Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:22:11 +0000 (14:22 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:22:11 +0000 (14:22 +0800)
1  2 
enrol/locallib.php

Simple merge