aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_connection.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-10-23 11:30:40 +0200
committerHenrik Nord <[email protected]>2014-10-23 11:30:40 +0200
commit9f0477e13bb8819ee252d2b8834c1411f02a9cb8 (patch)
tree6373cd013fc3ff1220b3845a8e50230d8105c04c /lib/ssh/src/ssh_connection.erl
parente97f9bc1672cb2d2c07d4133030528b43b26532c (diff)
parent461757503e8ecaaeb3ea9b84f5c0dfccd3408694 (diff)
downloadotp-9f0477e13bb8819ee252d2b8834c1411f02a9cb8.tar.gz
otp-9f0477e13bb8819ee252d2b8834c1411f02a9cb8.tar.bz2
otp-9f0477e13bb8819ee252d2b8834c1411f02a9cb8.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh_connection.erl')
-rw-r--r--lib/ssh/src/ssh_connection.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 87f37b93ef..f3ff9ae67a 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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