From: Quanah Gibson-Mount Date: Thu, 8 Sep 2011 21:06:30 +0000 (-0700) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1227 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d97d1e148c5189f7efd3a37ba3379f81d853518b;p=thirdparty%2Fopenldap.git Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- d97d1e148c5189f7efd3a37ba3379f81d853518b