From: Quanah Gibson-Mount Date: Fri, 5 Feb 2016 23:56:54 +0000 (-0600) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~100^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67fe3c50a7fdfdadcfdb18dd6d14802ebec45ac6;p=thirdparty%2Fopenldap.git Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- 67fe3c50a7fdfdadcfdb18dd6d14802ebec45ac6