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)

Trivial merge