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-Url: https://git.sur5r.net/?a=commitdiff_plain;h=74e8e39840c6550223f6bb4ef5e397d1c469ce0c;p=openldap Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- 74e8e39840c6550223f6bb4ef5e397d1c469ce0c