Merge pull request #4922 from Habbie/ldap-ptr-fix

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 21 Feb 2017 08:59:30 +0000 (09:59 +0100)

committer GitHub <noreply@github.com>

Tue, 21 Feb 2017 08:59:30 +0000 (09:59 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 21 Feb 2017 08:59:30 +0000 (09:59 +0100)
committer GitHub <noreply@github.com>
Tue, 21 Feb 2017 08:59:30 +0000 (09:59 +0100)
diff --cc modules/ldapbackend/ldapbackend.cc
Simple merge
diff --cc modules/ldapbackend/ldapbackend.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 21 Feb 2017 08:59:30 +0000 (09:59 +0100)
committer	GitHub <noreply@github.com>
	Tue, 21 Feb 2017 08:59:30 +0000 (09:59 +0100)
		1	2
modules/ldapbackend/ldapbackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ldapbackend/ldapbackend.hh	patch \|	diff1 \|	diff2 \|	blob \| history