diff options
author | Ingela Anderton Andin <[email protected]> | 2015-03-09 08:55:14 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-03-09 08:55:14 +0100 |
commit | f2d39216e0587db58b5a79c78bfe94b00334cd0d (patch) | |
tree | 5ec03fd69b6ff995d8a0edfb5d68b29bac1d1ead /erts/vsn.mk | |
parent | 444ca955aa7ca90cf5e2621bc5324b96a0c24947 (diff) | |
parent | be0f9642199c9a0d4ce2a98276f7b783a71d90f5 (diff) | |
download | otp-f2d39216e0587db58b5a79c78bfe94b00334cd0d.tar.gz otp-f2d39216e0587db58b5a79c78bfe94b00334cd0d.tar.bz2 otp-f2d39216e0587db58b5a79c78bfe94b00334cd0d.zip |
Merge branch 'ia/ssl/soft-upgrade-test-server-bug-workaround'
* ia/ssl/soft-upgrade-test-server-bug-workaround:
ssl: Workaround test server halfwordemulator bug
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions