Merge branch 'MDL-40613-master-ldap' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 4 Jan 2018 06:57:32 +0000 (14:57 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 4 Jan 2018 06:57:32 +0000 (14:57 +0800)
commit06634b7550cbc9da009d70f81bfeb809969914ef
treed5aba7755ee1bf0ec613ccdf6da164132018fbdf
parent0138cb7cf1e730c627195ac48e743d481700d3d8
parent725fcf31781faf185e433535d059a7ce539a505f
Merge branch 'MDL-40613-master-ldap' of git://github.com/andrewnicols/moodle