From: Kurt Zeilenga Date: Tue, 29 Mar 2011 01:42:22 +0000 (-0700) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1412 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf49e43f86de16f1cc84ab44f6d4fa3c7e18902f;p=thirdparty%2Fopenldap.git Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- cf49e43f86de16f1cc84ab44f6d4fa3c7e18902f