From: Quanah Gibson-Mount Date: Fri, 13 Jun 2014 17:54:40 +0000 (-0500) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~141^2~318 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24d5971ff3f1ec2211eb6525328a70c0fb61a16d;p=thirdparty%2Fopenldap.git Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- 24d5971ff3f1ec2211eb6525328a70c0fb61a16d