From: Quanah Gibson-Mount Date: Fri, 29 Jan 2016 19:22:10 +0000 (-0600) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2cea2f3b5f62969390c2e20bd758d2cec662edda;p=openldap Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- 2cea2f3b5f62969390c2e20bd758d2cec662edda