Merge pull request #10622 from seamuslee001/smtp_socket_fix
authorTim Otten <totten@civicrm.org>
Sat, 8 Jul 2017 23:25:53 +0000 (16:25 -0700)
committerGitHub <noreply@github.com>
Sat, 8 Jul 2017 23:25:53 +0000 (16:25 -0700)
commit4589b406fe95745988d85fb6315add3b0579ade2
tree8c1509fac57de2350f5de876462b6cae6fb55efa
parent0778420a772e6e265c89ffe6c841cd08abf2db41
parent31b7ce142666454fbfdeed9daeda183b6c55984d
Merge pull request #10622 from seamuslee001/smtp_socket_fix

Put back _ in socket and socket_options to refer correctly to staic v…