Merge branch 'wip_master_mdl-3941_add_support_for_LDAP_TLS' of git://github.com/iaren...
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 08:40:50 +0000 (16:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 08:40:50 +0000 (16:40 +0800)
1  2 
auth/ldap/auth.php
enrol/ldap/lib.php

Simple merge
Simple merge