From: Quanah Gibson-Mount Date: Tue, 17 Nov 2015 18:19:26 +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=81c8da4d6e2f1f82840209c151c81afc3190ef10;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 81c8da4d6e2f1f82840209c151c81afc3190ef10