Merge branch 'erc-async-reconnect' into emacs-25

[gnu-emacs] / lisp / net / socks.el

diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index 90ee20c8118fa8ea683d6d31b0c89e558c297ad6..db9579573f6eac5f8d0ac456ff5bf667afae83b6 100644 (file)
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -1,6 +1,6 @@
 ;;; socks.el --- A Socks v5 Client for Emacs
 
-;; Copyright (C) 1996-2000, 2002, 2007-2014 Free Software Foundation,
+;; Copyright (C) 1996-2000, 2002, 2007-2015 Free Software Foundation,
 ;; Inc.
 
 ;; Author: William M. Perry <wmperry@gnu.org>