]> git.sur5r.net Git - openldap/commit
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Wed, 9 Sep 2015 23:48:26 +0000 (18:48 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Wed, 9 Sep 2015 23:48:26 +0000 (18:48 -0500)
commita6f1c6bd86cbf9bd4ca8e9a96320064886457c6f
treeedc16cfce53784f87b887bf9e59ace03fede1e66
parent2e8175517b585d9e0cecad40ad6b80508a92e19f
parent6fe51a9ab04fd28bbc171da3cf12f1c1040d6629
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5