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