From: Quanah Gibson-Mount Date: Mon, 9 Nov 2015 21:20:49 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7c76e24b1c8ad03b38fec47885e3c3cb591ed72b;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 7c76e24b1c8ad03b38fec47885e3c3cb591ed72b