From: Quanah Gibson-Mount Date: Fri, 29 Jan 2016 19:22:41 +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=4021b88b318cb36f4339f8f117cb7ad2d6ab8bbc;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 4021b88b318cb36f4339f8f117cb7ad2d6ab8bbc