From: Quanah Gibson-Mount Date: Mon, 28 Sep 2015 19:41:04 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ea80a34bab41d71f5fb040db39ceb6c3a9cbaa1e;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- ea80a34bab41d71f5fb040db39ceb6c3a9cbaa1e