diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-02-06 19:04:16 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-02-06 19:04:16 +0100 |
| commit | b6ec922b75eb95519f1eff7261050a65a81e5927 (patch) | |
| tree | 9c9653af449d14a5558064b1dcb8bdce1c1482bc /make | |
| parent | 9f6f29e5c58ab9e39a4de3142c9670c925734130 (diff) | |
| parent | bca4b9783e9f2d6845b970f23f1b2f9a0ded7121 (diff) | |
| download | otp-b6ec922b75eb95519f1eff7261050a65a81e5927.tar.gz otp-b6ec922b75eb95519f1eff7261050a65a81e5927.tar.bz2 otp-b6ec922b75eb95519f1eff7261050a65a81e5927.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl_app.xml
lib/ssl/src/ssl_manager.erl
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions