Merge branch 'master_MDL-20867' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 23:07:00 +0000 (11:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 23:07:00 +0000 (11:07 +1200)
1  2 
auth/ldap/auth.php

Simple merge