From: Quanah Gibson-Mount Date: Mon, 5 Oct 2015 20:48:41 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a2abbdbb124fd290008015af89d2b0e06dbeb56b;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- a2abbdbb124fd290008015af89d2b0e06dbeb56b