aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-08-23 09:11:21 +0200
committerBjörn Gustavsson <[email protected]>2013-08-23 09:13:00 +0200
commit5f9c7987b3f4b34c4028783dc0f3f1c6c903d6ab (patch)
tree681027f78717162c62cbcd55c314907d536784dd /lib/ssl
parentd0f3453270325374a76f0f86215783f8a3475c56 (diff)
parenta21db4078a7b5f23b665dc2d466541b394936cb8 (diff)
downloadotp-5f9c7987b3f4b34c4028783dc0f3f1c6c903d6ab.tar.gz
otp-5f9c7987b3f4b34c4028783dc0f3f1c6c903d6ab.tar.bz2
otp-5f9c7987b3f4b34c4028783dc0f3f1c6c903d6ab.zip
Merge branch 'maint-r15' into maint-r16
Note that this is a fake merge. The bug fix changes files that are no longer present in maint, and the bug will need to be fixed in a different way. * maint-r15: Prepare release PER, UPER: Fix encoding/decoding of open types greater than 16K
Diffstat (limited to 'lib/ssl')
0 files changed, 0 insertions, 0 deletions