From: Quanah Gibson-Mount Date: Mon, 30 Nov 2015 16:59:23 +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=8bbbaea0b4ec58ad51b9fb1b09e7b6e996ee0361;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 8bbbaea0b4ec58ad51b9fb1b09e7b6e996ee0361