Merge branch 'MDL-48255-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 18:14:07 +0000 (19:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 18:14:07 +0000 (19:14 +0100)
commit6054036fbce7b2b9fda62bd3e15aff3fc2c40e84
treedff9d8d361a7fbe58fdec1566368dd0d3e56b171
parentc2f1feffd65c7c21fc55c55a072481b368ea08bb
parentef9739f0ebec20198a3c80966e0b5f76454ec482
Merge branch 'MDL-48255-master' of git://github.com/lameze/moodle
auth/ldap/auth.php