aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-01-22 14:19:29 +0100
committerIngela Anderton Andin <[email protected]>2013-01-22 14:19:29 +0100
commit9b01d9553434256b93b4899caf042d857f6ef068 (patch)
tree523c2ff056058002840a94352284c5ac244ace9a /erts
parentf7059ffbf0d9e7767eba1d4d96b291bfc96ef767 (diff)
parentacb225d301f6a1bcb02c607295e370471b7834bb (diff)
downloadotp-9b01d9553434256b93b4899caf042d857f6ef068.tar.gz
otp-9b01d9553434256b93b4899caf042d857f6ef068.tar.bz2
otp-9b01d9553434256b93b4899caf042d857f6ef068.zip
Merge branch 'ia/ssl/prepare-for-release'
* ia/ssl/prepare-for-release: ssl: Prepare for R16 release
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions