diff lisp/url/url-parse.el @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 754df5a0efe9 376148b31b5e
children ef719132ddfa
line wrap: on
line diff
--- a/lisp/url/url-parse.el	Fri Jan 14 16:06:17 2011 +0100
+++ b/lisp/url/url-parse.el	Fri Jan 14 12:18:41 2011 -0500
@@ -1,7 +1,7 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes