diff options
| author | Stefan Monnier <[email protected]> | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /lisp/url/url.el | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
Merge from emacs-23
Diffstat (limited to 'lisp/url/url.el')
| -rw-r--r-- | lisp/url/url.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/url/url.el b/lisp/url/url.el index 9d44718625..2529adeb96 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -1,7 +1,7 @@ ;;; url.el --- Uniform Resource Locator retrieval tool -;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Bill Perry <[email protected]> ;; Keywords: comm, data, processes, hypermedia |