diff options
author | Micael Karlberg <[email protected]> | 2011-03-17 12:28:39 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-17 12:28:39 +0100 |
commit | b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c (patch) | |
tree | d1bcdaaf38253733570660bf63183ca65bc454a9 /erts/doc/src/erlang.xml | |
parent | a5d14f14e04ca7ca5fd34a7811cefbccdd024ce4 (diff) | |
parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
download | otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.tar.gz otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.tar.bz2 otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.zip |
Merge branch 'dev' into bmk/inets/httpd/make_mod_esi_deliver_accept_binary_data/OTP-9123
Diffstat (limited to 'erts/doc/src/erlang.xml')
-rw-r--r-- | erts/doc/src/erlang.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index c3f06982f5..19f501391f 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1996</year><year>2010</year> + <year>1996</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> |