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)
commit12bdea2eb557d8dc3547c23969906dd0e8f13e7d
tree371d348fb3cf72d9c6d5107203e5eeada4b18fcb
parent02213adfd0b19048836c35b0f89511a11c65579d
parentee9e079ddd8b4a8bc767ec218a1ccbc7a131d75c
Merge branch 'MDL-35864' of https://github.com/danielneis/moodle
enrol/database/lib.php
enrol/imsenterprise/lib.php
lib/enrollib.php