From: Mark Hanna <mark@skvare.com>
Date: Sat, 8 Jul 2017 22:13:29 +0000 (-0500)
Subject: Merge pull request #10623 from seamuslee001/smtp_socket_fix_46
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=95bd23297309ff47f3e574d52b022e6157c44201;p=civicrm-core.git

Merge pull request #10623 from seamuslee001/smtp_socket_fix_46

Put back _ in socket and socket_options to refer correctly to static variables
---

95bd23297309ff47f3e574d52b022e6157c44201