aboutsummaryrefslogtreecommitdiffstats
path: root/system/COPYRIGHT
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 /system/COPYRIGHT
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 'system/COPYRIGHT')
-rw-r--r--system/COPYRIGHT2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/COPYRIGHT b/system/COPYRIGHT
index 444efcd6f5..94e9795b16 100644
--- a/system/COPYRIGHT
+++ b/system/COPYRIGHT
@@ -5,7 +5,7 @@ This software is subject to the following Copyrights and Licenses:
%CopyrightBegin%
-Copyright Ericsson AB 1997-2010. All Rights Reserved.
+Copyright Ericsson AB 1997-2011. All Rights Reserved.
The contents of this file are subject to the Erlang Public License,
Version 1.1, (the "License"); you may not use this file except in