diff options
author | Ingela Anderton Andin <[email protected]> | 2010-09-27 10:17:22 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-09-27 10:17:22 +0200 |
commit | 2e96bd45aeab647a839cd8b0a0741267cc0a70e5 (patch) | |
tree | e0df325de559ff67f3a6d357d391fa9bc49e35cf /lib/Makefile | |
parent | 0a1f48c46cf629af7d3719e94250733d1589efa1 (diff) | |
parent | 266ea3592e49cc93e69735eea4572e95fedc6a19 (diff) | |
download | otp-2e96bd45aeab647a839cd8b0a0741267cc0a70e5.tar.gz otp-2e96bd45aeab647a839cd8b0a0741267cc0a70e5.tar.bz2 otp-2e96bd45aeab647a839cd8b0a0741267cc0a70e5.zip |
Merge branch 'ia/ssl-and-public_key/backwards-compatibility/OTP-8858' into dev
* ia/ssl-and-public_key/backwards-compatibility/OTP-8858:
Backwards compatibility
Conflicts:
lib/ssl/src/ssl_certificate_db.erl
Use short INFO-message. Debugging information can be fairly
easily recreated so we do not want to clutter the logs.
Diffstat (limited to 'lib/Makefile')
0 files changed, 0 insertions, 0 deletions