Merge branch 'MDL-35864' of https://github.com/danielneis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 15:32:26 +0000 (16:32 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 15:32:26 +0000 (16:32 +0100)
1  2 
enrol/database/lib.php
enrol/imsenterprise/lib.php
lib/enrollib.php

Simple merge
Simple merge
Simple merge