Merge from emacs-24; up to 2014-07-28T02:47:29Z!fgallina@gnu.org

[gnu-emacs] / lisp / url / url-ns.el

diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index 2eaa662be55198f1ec0d6d9cf2ed1aeda58a28b0..30506d43349cca840a74c496415b29d0381de0c2 100644 (file)
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -1,6 +1,6 @@
 ;;; url-ns.el --- Various netscape-ish functions for proxy definitions
 
-;; Copyright (C) 1997-1999, 2004-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1999, 2004-2014 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia