Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 21:51:22 +0000 (23:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 21:51:22 +0000 (23:51 +0200)
commit0288c5ffe15217bf1758ef7e3c1c4ee1adcedfe1
treee5476ba3eeeb01c30dd2c33e7d3f41dba6a0c993
parent9e3b5a47f63b877fd0517d15956eb81ea4a90063
parent9b8e4952d4dd9fe72d276389204056336ca011ce
Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle
auth/ldap/auth.php