From: Quanah Gibson-Mount Date: Tue, 29 May 2012 23:09:31 +0000 (-0700) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~939 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e8e39840c6550223f6bb4ef5e397d1c469ce0c;p=thirdparty%2Fopenldap.git Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- 74e8e39840c6550223f6bb4ef5e397d1c469ce0c