From: Quanah Gibson-Mount Date: Tue, 17 Jan 2017 18:42:08 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6068bd212ab47f260d1b46e7ad0780f0008cf9c5;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 6068bd212ab47f260d1b46e7ad0780f0008cf9c5