aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/escript.xml
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-17 12:24:59 +0100
committerMicael Karlberg <[email protected]>2011-03-17 12:24:59 +0100
commitffb2d69e00ef283eeb266f3082067429b6ce1127 (patch)
tree134573a992cfcc23dad544eae9c5650f97d0e208 /erts/doc/src/escript.xml
parentbf6a8c53023a284b9f2de8d13538db1ab3ff8dee (diff)
parentf861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff)
downloadotp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.gz
otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.bz2
otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.zip
Merge branch 'dev' into bmk/inets/httpd/prevent_xss_in_error_pages/OTP-9124
Diffstat (limited to 'erts/doc/src/escript.xml')
-rw-r--r--erts/doc/src/escript.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/escript.xml b/erts/doc/src/escript.xml
index 588508aae6..66e904f64f 100644
--- a/erts/doc/src/escript.xml
+++ b/erts/doc/src/escript.xml
@@ -4,7 +4,7 @@
<comref>
<header>
<copyright>
- <year>2007</year><year>2010</year>
+ <year>2007</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>