Merge branch 'MDL-58273-master-ldapenrol' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 11:09:33 +0000 (11:09 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 11:09:33 +0000 (11:09 +0000)

Trivial merge