From: Quanah Gibson-Mount Date: Tue, 19 Jan 2016 00:22:18 +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=385e524233c4e70ca71988756b7217c8039768ea;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 385e524233c4e70ca71988756b7217c8039768ea