diff options
author | Ingela Anderton Andin <[email protected]> | 2014-06-03 09:54:54 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-06-03 09:54:54 +0200 |
commit | 6c2c2d2026ed7f2243af98cbe7bbf7f58883af10 (patch) | |
tree | 7e109e9789974917f203bc851fd54f6e6d4fa82a /erts/emulator | |
parent | c8737c5c1e4aa1c5e8eecdc60a0a27d70001b1e0 (diff) | |
parent | 49d0909199c0ef9e846dbc8a6a86dcba95af2300 (diff) | |
download | otp-6c2c2d2026ed7f2243af98cbe7bbf7f58883af10.tar.gz otp-6c2c2d2026ed7f2243af98cbe7bbf7f58883af10.tar.bz2 otp-6c2c2d2026ed7f2243af98cbe7bbf7f58883af10.zip |
Merge branch 'ia/ssl/prep-release' into maint
* ia/ssl/prep-release:
ssl: Prepare for release
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions