From: Quanah Gibson-Mount Date: Tue, 2 Feb 2016 21:58:55 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6651f47510f3907aac311c16a82f5399acc19629;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 6651f47510f3907aac311c16a82f5399acc19629