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)
1  2 
auth/ldap/auth.php

Simple merge