From: Quanah Gibson-Mount Date: Tue, 18 Aug 2015 20:07:45 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fe1afce090d2d9444658cc17214733c748a34ba9;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- fe1afce090d2d9444658cc17214733c748a34ba9