From: Quanah Gibson-Mount Date: Mon, 17 Oct 2016 17:41:15 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=302b4c9f6e30372315ac403e668f1e1188217604;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 302b4c9f6e30372315ac403e668f1e1188217604