diff options
author | Ingela Anderton Andin <[email protected]> | 2013-06-07 09:34:25 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-06-07 09:34:25 +0200 |
commit | b1da47eff2e41013d60dacebbdfa31ce60357d23 (patch) | |
tree | 5f4abafc313eaaeb11427b0cdee00fba7d18cc7f /erts/preloaded/src/erlang.erl | |
parent | 2d0ef0bfb0cef18d368d9fe7518daa0360f9ad27 (diff) | |
parent | c6ce327bfca8fc509a66512bcaedb468d4e86d00 (diff) | |
download | otp-b1da47eff2e41013d60dacebbdfa31ce60357d23.tar.gz otp-b1da47eff2e41013d60dacebbdfa31ce60357d23.tar.bz2 otp-b1da47eff2e41013d60dacebbdfa31ce60357d23.zip |
Merge branch 'ia/ssl/prepare-for-release' into maint
* ia/ssl/prepare-for-release:
ssl: Prepare for release
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
0 files changed, 0 insertions, 0 deletions