Merge branch 'MDL-52387-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 03:25:22 +0000 (11:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 03:25:22 +0000 (11:25 +0800)
1  2 
auth/ldap/auth.php

Simple merge