diff options
author | Micael Karlberg <[email protected]> | 2011-05-25 14:46:01 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-05-25 14:46:01 +0200 |
commit | 77fe4062599e4ffe897c21d22ad493cfec4b475c (patch) | |
tree | 05aa46f994c61f0dc068b857c76f8ff2e8b993db /lib/ssl/src/ssl_connection.erl | |
parent | 26b854ade6f1d89379f6337b18dde32e9abb9615 (diff) | |
parent | 50261525973798faf7f62ea02356447b16e5fc56 (diff) | |
download | otp-77fe4062599e4ffe897c21d22ad493cfec4b475c.tar.gz otp-77fe4062599e4ffe897c21d22ad493cfec4b475c.tar.bz2 otp-77fe4062599e4ffe897c21d22ad493cfec4b475c.zip |
Merge remote-tracking branch 'upstream/maint-r13' into maint-r14
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
0 files changed, 0 insertions, 0 deletions