aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erlang.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-03-22 09:46:55 +0100
committerIngela Anderton Andin <[email protected]>2012-03-22 09:46:55 +0100
commit9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc (patch)
tree25ce136a104a9a6c0595442cc4e33052ff3673bd /erts/doc/src/erlang.xml
parent33e42a694e0ddd8a6c02bfe6c04298ca95aa938a (diff)
parent7ae61df3b0e41397e9731d8aa115905f6ff0a45c (diff)
downloadotp-9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc.tar.gz
otp-9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc.tar.bz2
otp-9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc.zip
Merge branch 'ia/ssl/prepare-for-release' into maint
* ia/ssl/prepare-for-release: Prepare for release
Diffstat (limited to 'erts/doc/src/erlang.xml')
0 files changed, 0 insertions, 0 deletions