]> git.sur5r.net Git - openldap/commit
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Mon, 5 Oct 2015 20:48:41 +0000 (15:48 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Mon, 5 Oct 2015 20:48:41 +0000 (15:48 -0500)
commita2abbdbb124fd290008015af89d2b0e06dbeb56b
tree3cec349b7488da9869c84b8d7502227484119e87
parent4ef6520b4d6fe466c2e348e0ce8da523355e592b
parentb6974ccd9f2c8cd9cf3f10d9466edcc043681363
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5