Merge pull request #4477 from KamagoNet/ldap-backend-update

author Peter van Dijk <peter.van.dijk@powerdns.com>

Mon, 10 Apr 2017 11:21:58 +0000 (13:21 +0200)

committer GitHub <noreply@github.com>

Mon, 10 Apr 2017 11:21:58 +0000 (13:21 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Mon, 10 Apr 2017 11:21:58 +0000 (13:21 +0200)
committer GitHub <noreply@github.com>
Mon, 10 Apr 2017 11:21:58 +0000 (13:21 +0200)
diff --cc docs/markdown/authoritative/backend-ldap.md
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Mon, 10 Apr 2017 11:21:58 +0000 (13:21 +0200)
committer	GitHub <noreply@github.com>
	Mon, 10 Apr 2017 11:21:58 +0000 (13:21 +0200)