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)
commitce74ad69ae81f85975aedd5ed08204901ac9de55
treeefcef3fdc93dd84917934449979bfb08c01e81a4
parentfb2d4baf5713e13188e4dd7028753ef2356b29c1
parentc1bc628e1d27bd6c7efc1ab3d2f68161e8c0e2de
Merge branch 'MDL-52387-master' of git://github.com/lameze/moodle
auth/ldap/auth.php