From: Quanah Gibson-Mount Date: Tue, 22 Sep 2015 23:26:32 +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=4edf7283effe96b5a5d5d7f87a6f7a7d7ea08f28;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 4edf7283effe96b5a5d5d7f87a6f7a7d7ea08f28