aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-06-20 11:02:51 +0200
committerIngela Anderton Andin <[email protected]>2012-06-20 11:02:51 +0200
commit00dee07f0480994a303e16c803d367c34c2a7f26 (patch)
tree71d20efcdaf02a4752b7449b0eabe887762375ce /erts
parentc2388ad41790c266b0e78724b95ec92d2951b43a (diff)
parentc6b0348bb4ab8e3603b06b9e58dcbca2641bd35a (diff)
downloadotp-00dee07f0480994a303e16c803d367c34c2a7f26.tar.gz
otp-00dee07f0480994a303e16c803d367c34c2a7f26.tar.bz2
otp-00dee07f0480994a303e16c803d367c34c2a7f26.zip
Merge remote branch 'upstream/maint'
* upstream/maint: ssl: Fix pem cache bug
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions